The following commit has been merged in the sid branch:
commit f18c197931e280ff3594dd06585ad1a15e24bc28
Author: Raphaël Hertzog <[email protected]>
Date: Thu Oct 6 16:54:57 2011 +0200
dpkg-source: ignore changes on debian/patches/.dpkg-source-applied
With 2.0 source packages, dpkg-source records as a comment in
debian/patches/.dpkg-source-applied whether the patches have
been applied at build time or at unpack time.
This can lead to differences between the file in the build tree
and the file in the reference tree used to check for changes.
Thus we need to ignore that file in the diff process or the build
might fail considering this difference as a local change that
has not been recorded in a patch.
Reported-by: Jakub Wilk <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index c476b99..69ba2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ dpkg (1.16.1.1) UNRELEASED; urgency=low
* Fix trigger setup code to not reset the status of packages
when they are in a status different from triggers-awaited,
triggers-pending or installed. Closes: #644492
+ * Fix dpkg-source to ignore changes on debian/patches/.dpkg-source-applied
+ when building a "2.0" source package. Closes: #642656
[ Guillem Jover ]
* Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index a5d32e1..891158d 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -287,7 +287,8 @@ sub after_build {
sub prepare_build {
my ($self, $dir) = @_;
$self->{'diff_options'} = {
- diff_ignore_regexp => $self->{'options'}{'diff_ignore_regexp'},
+ diff_ignore_regexp => $self->{'options'}{'diff_ignore_regexp'} .
+ '|(^|/)debian/patches/.dpkg-source-applied$',
include_removal => $self->{'options'}{'include_removal'},
include_timestamp => $self->{'options'}{'include_timestamp'},
use_dev_null => 1,
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
