don't treat build-depends-indep as cross-build-dependencies; we should

always install the host arch versions.  LP: #968828.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b0a845b4a3802655969d8467f4b8c3db414cbfb2..45405e7613f3dae730db36618c1c1a47bf4e8897 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2827,7 +2827,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 fbf44d6e40feb9f2fb38c6b19d3b69375c3631d2..bda65c54365457bc1bacc0832eb1e0abd4816edf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.8.16~exp12ubuntu7) UNRELEASED; urgency=low
 
   * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
     dropped in maverick.
 
   * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
     dropped in maverick.

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

 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 00:05:43 -0700
 
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 00:05:43 -0700