Procházet zdrojové kódy

Allow patches in wig&pen format to remove files

* scripts/Dpkg/Source/Package/V2_0.pm: Use -E option of patch
to apply patches so that empty files are removed.
* man/dpkg-source.1: Update manual page accordingly.
Raphael Hertzog před 18 roky
rodič
revize
b03c0d9d44
2 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 1 1
      man/dpkg-source.1
  2. 2 1
      scripts/Dpkg/Source/Package/V2_0.pm

+ 1 - 1
man/dpkg-source.1

@@ -328,7 +328,7 @@ any pre-existing \fBdebian\fP directory).
 .PP
 All patches in \fBdebian/patches\fP matching the perl regular expression
 \fB[\\w\-]+\fP are then applied in alphabetical order. The timestamp of
-patched files are reset to the extraction time. The patches can't remove
+patched files are reset to the extraction time. The patches can remove
 files.
 .PP
 .B Building

+ 2 - 1
scripts/Dpkg/Source/Package/V2_0.pm

@@ -150,7 +150,8 @@ sub apply_patches {
         info(_g("applying %s"), $patch) unless $skip_auto;
         my $patch_obj = Dpkg::Source::Patch->new(filename => $path);
         $patch_obj->apply($dir, force_timestamp => 1,
-                          timestamp => $timestamp);
+                          timestamp => $timestamp,
+                          add_options => [ '-E' ]);
     }
 }