* merged with apt--mvo--0 and apt--ddtp--0

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9716c3836d31aa4c70bbb42be2240d15f10d908b..b854d174198dd8e0846069c9c72cc5d6f081fa7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.42.1exp1) 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>  Wed, 19 Oct 2005 22:12:13 +0200
+

 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page
 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page


@@ -41,7 +51,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)
   * 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
  -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
 
 apt (0.6.41) unstable; urgency=low


@@ -126,6 +136,7 @@ apt (0.6.38) unstable; urgency=low
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
   
  -- 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
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81