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.

diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index a91582d1da665e54a277574263c86a85f1718199..f03f4f8874990c879e4fab82b10a17d045ca5da8 100644 (file)
--- a/man/dpkg-source.1
+++ b/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

diff --git a/scripts/Dpkg/Source/Package/V2_0.pm b/scripts/Dpkg/Source/Package/V2_0.pm
index 0d6ac112b39d35ece93cea1ba97fe34261646887..08df0f1edc16af1911bdd51b958c41aaf0b0ee4f 100644 (file)
--- a/scripts/Dpkg/Source/Package/V2_0.pm
+++ b/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' ]);
     }
 }