From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Dec 2006 18:36:21 +0000 (+0100)
Subject: * merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~212
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6a30946d00371ff1fb7f94791364706a4bac0ea2

* merged from apt--mvo
---

6a30946d00371ff1fb7f94791364706a4bac0ea2
diff --cc debian/changelog
index 2b37e51ae,127c5fd83..f39b0a073
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,10 +1,24 @@@
+ apt (0.6.46.5) unstable; urgency=low
+ 
+   * apt-pkg/algorithm.cc:
+     - use clog for all debugging
+ 
+  --
+ 
 +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
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
 +
  apt (0.6.46.4) unstable; urgency=high
  
    * ack NMU (closes: #401017)