From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 14 Feb 2010 23:01:36 +0000 (+0100)
Subject: Activate support of :any and stuff in apt-get build-dep as we have
X-Git-Tag: 0.8.0~9^2~64^2~20^2~17
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/af3f8112590edf58cab36e72bca6d5f8e161fbc3

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 5ef5533e2..216383bc6 100644
--- 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 addee11cd..948846a6c 100644
--- 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)