* merged with mainline

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f30edf5a161882f796f0a94348658f1343984186..513d409e90c0904dc514df3f68f2b5fa1b1a48e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+  
+  * apt-pkg/algorithms.cc:
+    - only increase the score of installed applications if they 
+      are not obsolete (lp: #63680)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
+
+apt (0.6.46.4ubuntu3) feisty; urgency=low
+
+  * apt-pkg/algorithm.cc:
+    - use clog for all debugging
+  * apt-pkg/depcache.cc:
+    - never mark Required package for autoremoval (lp: #75882)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
+
+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 +67,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:
@@ -121,6 +153,14 @@ apt (0.6.46) unstable; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Sep 2006 00:34:20 +0200
 
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+  * cmdline/apt-get.cc:
+    - fix in the TryInstallTask() code to make sure that all package
+      there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Sep 2006 00:34:20 +0200
+
 apt (0.6.45ubuntu13) edgy; urgency=low
 
   * no-changes upload to make apt rebuild against latest g++ and
@@ -350,7 +390,7 @@ apt (0.6.44.2ubuntu1) edgy; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 
-apt  (0.6.44.2) unstable; urgency=low
+apt (0.6.44.2) unstable; urgency=low
   
    * apt-pkg/depcache.cc:
      - added Debug::pkgDepCache::AutoInstall (thanks to infinity)