From 8dd883f2977a624c20257f905e3c10dce82c19df Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Sat, 5 Apr 2008 20:06:40 +0200 Subject: [PATCH] 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 | 6 ++++++ debian/changelog | 2 ++ scripts/Dpkg/Source/Package/V1_0.pm | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ce757b50..9facac94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-05 Raphael Hertzog + + * 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 * scripts/Dpkg/Shlibs/SymbolFile.pm (get_smallest_version): New diff --git a/debian/changelog b/debian/changelog index b6f454c2..f9b3ba90 100644 --- 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 a3e69607..470242a4 100644 --- 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; -- 2.39.5