The following commit has been merged in the master branch:
commit e7403b1421b865572ce45e3a710df166c167f056
Author: Guillem Jover <[email protected]>
Date: Mon Oct 29 07:44:36 2012 +0100
dpkg-shlibdeps: Also check Build-Depends-Arch for minimal versions
Closes: #681470
diff --git a/debian/changelog b/debian/changelog
index fe38bef..6ffbffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Add new dpkg-buildpackage --force-sign option.
* By default do not sign builds for UNRELEASED uploads on dpkg-buildpackage.
Closes: #635117
+ * Also check Build-Depends-Arch for minimal versions in dpkg-shlibdeps.
+ Closes: #681470
-- Guillem Jover <[email protected]> Fri, 03 Aug 2012 13:21:00 +0200
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index ad0c06f..f4cc571 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -139,10 +139,10 @@ scalar keys %exec || usageerr(_g("need at least one
executable"));
my $control = Dpkg::Control::Info->new();
my $fields = $control->get_source();
-my $build_depends = defined($fields->{"Build-Depends"}) ?
- $fields->{"Build-Depends"} : "";
-my $build_deps = deps_parse($build_depends, build_dep => 1, reduce_arch => 1);
-error(_("error occurred while parsing %s"), "Build-Depends") unless defined
$build_deps;
+my $bd_value = deps_concat($fields->{"Build-Depends"},
$fields->{"Build-Depends-Arch"});
+my $build_deps = deps_parse($bd_value, build_dep => 1, reduce_arch => 1);
+error(_("error occurred while parsing %s"), "Build-Depends/Build-Depends-Arch")
+ unless defined $build_deps;
my %dependencies;
my %shlibs;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
