* fixed conflict in changelog

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 16fdd1596ee09ec6428ba9084801e13bdbbf5905..f7f00354f8b935ee8ffc1ba6009de753dd08d980 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+  * merged some missing bits that wheren't merged by baz in the previous
+    upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  8 Dec 2005 18:35:58 +0100
+
 apt (0.6.43ubuntu1) dapper; urgency=low
 
   * merged with debian
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
 
-apt (0.6.43) unstable; urgency=low
+apt (0.6.43) unstable; urgency=medium
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
     * zh_CN.po: Completed to 510 strings(Closes: #338267)
@@ -18,8 +25,11 @@ apt (0.6.43) unstable; urgency=low
   * support a download rate limit for http (closes: #146877)
   * included lots of the speedup changes from #319377
   * add stdint.h to contrib/md5.h (closes: #340448)
+  * ABI change, library name changed (closes: #339147)
+  * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
+  * switch to libdb4.3 in build-depends
   
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:22:31 +0100
+ -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
 
 apt (0.6.42.3ubuntu2) dapper; urgency=low