0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index f50c52a3297842910d60b45a661b3b00adf54583..723c8ea3ab4a22f11d71081e82128a31a15dd160 100644 (file)
--- 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 6dc69ba12ff6c1d64e45ea1d686a0e7f12c8b91b..6e57e1bf8f40a8be7f1cdb71d5f984294592a0f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.45ubuntu6) edgy; urgency=low
 
   * Tests pass without code changes!  Except that we need this: