merged r1970 lp:~vorlon/apt/lp.968828

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6d7f802027d930793ba7136155bddf56120e65de..bff7ef7b6aab84f99d2d5216971b6b5e14593fde 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2864,7 +2864,7 @@ bool DoBuildDep(CommandLine &CmdL)
            pkgCache::PkgIterator Pkg;
 
            // Cross-Building?
            pkgCache::PkgIterator Pkg;
 
            // Cross-Building?

-           if (StripMultiArch == false)
+           if (StripMultiArch == false && D->Type != pkgSrcRecords::Parser::BuildDependIndep)

            {
               size_t const colon = D->Package.find(":");
               if (colon != string::npos &&
            {
               size_t const colon = D->Package.find(":");
               if (colon != string::npos &&

diff --git a/debian/changelog b/debian/changelog
index f6446ccbc8487f61bd97d819f05637d937e12028..e31b1b80ec530f09e4b4a224157e0ac7a302b50d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,10 @@ apt (0.9.0~exp1) UNRELEASEDexperimental; urgency=low
       number of auto-removed packages both before and after the list
       of packages (Closes: #665833)
 
       number of auto-removed packages both before and after the list
       of packages (Closes: #665833)
 

+  [ Steve Langasek ]
+  * don't treat build-depends-indep as cross-build-dependencies; we should
+    always install the host arch versions.  LP: #968828.
+  

  -- Michael Vogt <mvo@debian.org>  Wed, 11 Apr 2012 17:53:39 +0200
 
 apt (0.8.16~exp13) experimental; urgency=low
  -- Michael Vogt <mvo@debian.org>  Wed, 11 Apr 2012 17:53:39 +0200
 
 apt (0.8.16~exp13) experimental; urgency=low