diff options
| author | Michael Vogt <egon@tas> | 2006-12-07 23:09:25 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@tas> | 2006-12-07 23:09:25 +0100 |
| commit | 09ddf81f7665f3ae2c854308fc60d9722beed13a (patch) | |
| tree | 3f35ce717d205a837727310cbb77050e65aa328b | |
| parent | d3a39605ee9af421363ee6e36c1168d15bd7eed2 (diff) | |
merged iwjs patch
| -rw-r--r-- | apt-pkg/algorithms.cc | 1 | ||||
| -rw-r--r-- | debian/changelog | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index ddfda754d..9011821bb 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -986,6 +986,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug) clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl; + Cache.MarkKeep(I, false, false); continue; } diff --git a/debian/changelog b/debian/changelog index 511f407e8..2b37e51ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + (thanks to Ian Jackson) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100 + apt (0.6.46.4ubuntu1) feisty; urgency=low * merged with debian @@ -42,6 +50,13 @@ apt (0.6.46.3-0.1) unstable; urgency=high -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000 +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000 + apt (0.6.46.3ubuntu1) feisty; urgency=low * doc/apt-get.8.xml: |