From: Raphael Hertzog <hertzog@debian.org>
Date: Tue, 18 Mar 2008 10:31:26 +0000 (+0100)
Subject: Allow patches in wig&pen format to remove files
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b03c0d9d44e766a47c90a3762419a0649e4436b3;p=dpkg

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 a91582d1..f03f4f88 100644
--- 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 0d6ac112..08df0f1e 100644
--- 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' ]);
     }
 }