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 @@.

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

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).

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;