summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b0a845b4a..45405e761 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2827,7 +2827,7 @@ bool DoBuildDep(CommandLine &CmdL)
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 &&
diff --git a/debian/changelog b/debian/changelog
index fbf44d6e4..bda65c543 100644
--- 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.
+ * 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