diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-12 12:18:43 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-12 12:18:43 +0200 |
| commit | c307a4f0aa29c9c52a0e028524d21b448a53d09b (patch) | |
| tree | 963b5a790718c2ad9ce3a48c04a36569948097d2 | |
| parent | c77d65974e931762dcf5d07a467f9825aa807dde (diff) | |
merged r1970 lp:~vorlon/apt/lp.968828
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6d7f80202..bff7ef7b6 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2864,7 +2864,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 f6446ccbc..e31b1b80e 100644 --- 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) + [ 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 |