The following commit has been merged in the master branch:
commit 6f6814491f0240a4de97f22e60661489bb36f914
Author: Raphaël Hertzog <[email protected]>
Date: Thu Nov 5 21:12:15 2009 +0100
Dpkg::Source::Package::V2:do_build(): fix binary file check
The find() call that is supposed to look for binary files in the debian
sub-directory was missing the no_chdir option and due to this the
File::Spec->abs2rel() call (inside the wanted function) was returning an
invalid value when find() changed the current directory (since its second
parameter is only valid while being in the current directory).
The parameter got lost by mistake in
3525f79792cff51757d99d45f51c96a15e6fa779
and it was present in lenny's version.
diff --git a/debian/changelog b/debian/changelog
index 738d7c8..836079a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ dpkg (1.15.5) UNRELEASED; urgency=low
* Fix bashisms in dselect multicd access method. Closes: #530070
* Add support of "xz" compression method for source packages. Add dependency
dpkg-dev → xz-utils to ensure xz and unxz are available.
+ * Fix dpkg-source --include-binaries to correctly compute the path name of
+ the discovered binary files. Closes: #554612
[ Updated dpkg translations ]
* Czech (Miroslav Kure).
diff --git a/scripts/Dpkg/Source/Package/V2.pm
b/scripts/Dpkg/Source/Package/V2.pm
index 613dff9..b7fe76d 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -349,8 +349,8 @@ sub do_build {
}
return @result;
};
- find({ wanted => $check_binary, preprocess => $filter_ignore },
- File::Spec->catdir($dir, "debian"));
+ find({ wanted => $check_binary, preprocess => $filter_ignore,
+ no_chdir => 1 }, File::Spec->catdir($dir, "debian"));
error(_g("detected %d unwanted binary file(s) " .
"(add them in debian/source/include-binaries to allow their " .
"inclusion)."), $unwanted_binaries) if $unwanted_binaries;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
