Sfoglia il codice sorgente

dpkg-shlibdeps: Also check Build-Depends-Arch for minimal versions

Closes: #681470
Guillem Jover 13 anni fa
parent
commit
e7403b1421
2 ha cambiato i file con 6 aggiunte e 4 eliminazioni
  1. 2 0
      debian/changelog
  2. 4 4
      scripts/dpkg-shlibdeps.pl

+ 2 - 0
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 <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
 

+ 4 - 4
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;