dpkg-source: don't use diff -p for Format: 1.0

* scripts/Dpkg/Source/Package/V1_0.pm: Do not use
diff -p to generate patches as dpkg-source of sarge doesn't accept
data after the @@.

diff --git a/ChangeLog b/ChangeLog
index ce757b505c7d7040a44de49406e03d98f269c001..9facac940e927ab4e0ce8f4a1e22bec3758178d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-05  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Source/Package/V1_0.pm: Do not use
+       diff -p to generate patches as dpkg-source of sarge doesn't accept
+       data after the @@.
+
 2008-04-04  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Shlibs/SymbolFile.pm (get_smallest_version): New

diff --git a/debian/changelog b/debian/changelog
index b6f454c24f468f83c6381a88a92fab56ef6dc356..f9b3ba9041b34a197cd912baffb4b60782e317de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ dpkg (1.14.18) UNRELEASED; urgency=low
     an unversioned dependency. It's the only way to ensure the library
     presence if it wasn't available in all versions of the package that ever
     existed. Closes: #474079
+  * Don't use the -p option of diff for Format: 1.0 source packages.
+    dpkg-source of sarge doesn't accept data after @@.
 
   [ Updated dselect translations ]
   * German. (Sven Joachim).

diff --git a/scripts/Dpkg/Source/Package/V1_0.pm b/scripts/Dpkg/Source/Package/V1_0.pm
index a3e696070f3fdbecc6484f0746e5054323e10e3e..470242a430f15db51271c9ad025392cc1880cb08 100644 (file)
--- a/scripts/Dpkg/Source/Package/V1_0.pm
+++ b/scripts/Dpkg/Source/Package/V1_0.pm
@@ -335,7 +335,9 @@ sub do_build {
         $diff->create();
         $diff->add_diff_directory($origdir, $dir,
                 basedirname => $basedirname,
-                diff_ignore_regexp => $diff_ignore_regexp);
+                diff_ignore_regexp => $diff_ignore_regexp,
+                options => []); # Force empty set of options to drop the
+                                # default -p option
         $diff->finish() || $ur++;
         pop @Dpkg::Exit::handlers;