merged iwjs patch

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index ddfda754daaf6809ce48d328961c859564ccc9fc..9011821bb676eaeef33a5981b936f05716166204 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;
                     }
                     if (Debug)
                        clog << "  Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl;

+                    Cache.MarkKeep(I, false, false);

                     continue;
                  }
 
                     continue;
                  }
 

diff --git a/debian/changelog b/debian/changelog
index 511f407e827c013467af8d4a31099b5f6c8e63dd..2b37e51aea2824259d24641bfca5cfa29964df1d 100644 (file)
--- 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
 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
 
   
  -- 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:
 apt (0.6.46.3ubuntu1) feisty; urgency=low
 
   * doc/apt-get.8.xml: