* merged with apt--debian-sid--0

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 020fe9813e75f91ede019acec48b54f70ffe0ffc..b54cb635f2a944559745109208e152804c300060 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.43.2exp1) experimental; urgency=low
+
+  * added support for package index diffs
+  * added support for i18n of the package descriptions
+  * synced with the apt--debian-sid--0 branch
+  * build from mvo@debian.org--2005/apt--debian-experimental--0
+    (from http://people.debian.org/~mvo/arch)
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 12 Jan 2006 23:40:32 +0100
+
 apt (0.6.43.2) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
@@ -129,7 +139,7 @@ apt (0.6.42) unstable; urgency=low
   * cmdline/apt-cdrom.cc: 
     - fix some missing gettext() calls (closes: #334539)
   * doc/apt-cache.8.xml: fix typo (closes: #334714)
-  
+
  -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
 
 apt (0.6.41) unstable; urgency=low
@@ -214,6 +224,7 @@ apt (0.6.38) unstable; urgency=low
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
+>>>>>>> MERGE-SOURCE
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81