* merged from ian

4 files changed, 21 insertions, 4 deletions

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index f50c52a32..723c8ea3a 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/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 35eb23dfa..93ad56641 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -54,7 +54,7 @@ pkgCache::Header::Header()
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
-   MajorVersion = 5;
+   MajorVersion = 6;
    MinorVersion = 0;
    Dirty = false;
    
diff --git a/debian/changelog b/debian/changelog
index 9c6232a6c..6e57e1bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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:
+  * Bump cache file major version to force rebuild so that Breaks
+    dependencies are included.
+  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+    --auto-deconfigure is very very old and dpkg-dev's Breaks support
+    is more or less orthogonal.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  5 Sep 2006 19:50:02 +0100
+
 apt (0.6.45ubuntu6~iwj) unstable; urgency=low
 
   * Initial draft of `Breaks' implementation.  Appears to compile,
@@ -13,8 +31,6 @@ apt (0.6.45ubuntu5) edgy; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
     - pass "--auto-deconfigure" to dpkg on install to support the
       new "breaks" in dpkg
-  * debian/control:
-    - depend on a dpkg with "breaks" support
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 
diff --git a/debian/control b/debian/control
index 62ca713f1..dfcebf41e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Recommends: ubuntu-keyring
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev (>= 1.13.22ubuntu4), apt-doc, bzip2, gnupg
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
 Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.