summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-02-15 00:01:36 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-02-15 00:01:36 +0100
commitaf3f8112590edf58cab36e72bca6d5f8e161fbc3 (patch)
treec13d9c395ea62e5e3aca4830c95d1ee425df791d
parent83742b3cf4b541fd61533dfecdc97e0e4502a7a4 (diff)
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
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog5
2 files changed, 4 insertions, 3 deletions
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)