diff options
| -rw-r--r-- | cmdline/apt-get.cc | 9 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0cf723466..9906ad710 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.143 2003/09/24 04:00:25 mdz Exp $ +// $Id: apt-get.cc,v 1.144 2003/10/29 17:56:31 mdz Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -2156,11 +2156,18 @@ bool DoBuildDep(CommandLine &CmdL) break; } if (CV.end() == true) + if (hasAlternatives) + { + continue; + } + else + { return _error->Error(_("%s dependency for %s cannot be satisfied " "because no available versions of package %s " "can satisfy version requirements"), Last->BuildDepType((*D).Type),Src.c_str(), (*D).Package.c_str()); + } } else { diff --git a/debian/changelog b/debian/changelog index e86a42716..25d99de57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ apt (0.5.15) unstable; urgency=low version 1.3 from debian-doc cvs - Create doc/es/.cvsignore * Patch from Koblinger Egmont <egmont@uhulinux.hu> to fix - pkgCache::PkgFileIterator::Label() to correcctly refer to File->Label + pkgCache::PkgFileIterator::Label() to correctly refer to File->Label rather than File->Origin (Closes: #213311) * Add missing comma and space to German translation of "downgraded" (Closes: #213975) @@ -14,6 +14,8 @@ apt (0.5.15) unstable; urgency=low * Fix whitespace in French translation of "Yes, do as I say!", which made it tricky to type. Thanks to Sylvain Pasche <sylvain.pasche@switzerland.org> (Closes: #217152) + * Let apt-get build-dep try alternatives if the installed package + doesn't meet version requirements (Closes: #214736) -- |