Activate support of :any and stuff in apt-get build-dep as we have

now support for MultiArch, so Multi-Arch: allowed packages should
already provide package:any

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5ef5533e25ddea758156558a72e81e5c1d51a728..216383bc68d042a0162dcf77558e5150346fdb83 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2458,7 +2458,7 @@ bool DoBuildDep(CommandLine &CmdL)
             
       // Process the build-dependencies
       vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps;
-      if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false)
+      if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false)
        return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
    
       // Also ensure that build-essential packages are present

diff --git a/debian/changelog b/debian/changelog
index addee11cd4eb103a339e8bdf82d24703043c4b71..948846a6c87893ea74e31f9c7e82a1ccddf69ef7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,10 @@ apt (0.7.26) UNRELEASED; urgency=low
     but we support the usage of the new ABI so libapt users
     can start to prepare for MultiArch (Closes: #536029)
   * Ignore :qualifiers after package name in build dependencies
-    for now as long we don't understand them (Closes: #558103)
+    in the library by default, but try to honour them in apt-get
+    as we have some sort of MultiArch support ready (Closes: #558103)
   * apt-pkg/contrib/mmap.{cc,h}:
-    - extend it to have a growable flag - unused now but maybe...
+    - extend it to have a growable flag - unused now but maybe…
   * apt-pkg/pkgcache.h:
     - use long instead of short for {Ver,Desc}File size,
       patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)