* merged with apt--mvo

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9e9b46ab9c36a9ebd16290465bea3f857f0695b8..d9ceff5eaf9f6630d1a3c3863f9ea9c9d4a1c993 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (0.6.42.3exp1) 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)
+  * fix bug in apt-cache when displaying the record (closes: #334887)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+  
+ -- Michael Vogt <mvo@debian.org>  Sun, 13 Nov 2005 13:33:57 +0100
+
 apt (0.6.42.3) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -70,7 +83,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
@@ -155,6 +168,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