diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-03-30 10:01:05 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-03-30 10:01:05 -0700 |
| commit | 7cf3e9a75ace344416da4d53d723768cee088e76 (patch) | |
| tree | 30afc6ab100d348daae2a7d75bff36c1583bf789 | |
| parent | cfb1964dffc679027261719e47a4e145d9fec8c1 (diff) | |
| parent | 7fd909a909b5cec2aae82e28083f6a252e527e3d (diff) | |
merge fix for bug #968828
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 cbf596362..9fe896f22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.8.16~exp12ubuntu7) UNRELEASED; urgency=low * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was dropped in maverick. * Build-depend on gettext:any for cross-building support. + * 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 |