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

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5c1b1347e43cc0cf7cae0bc2672e407fdad950e1..b54cb635f2a944559745109208e152804c300060 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+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:
+    - en_GB.po, de.po: fix spaces errors in "Ign " translations
+      Closes: #347258
+    - makefile: make update-po a pre-requisite of clean target so
+               that POT and PO files are always up-to-date
+    - sv.po: Completed to 511t. Closes: #346450
+    - sk.po: Completed to 511t. Closes: #346369
+    - fr.po: Completed to 511t
+    - *.po: Updated from sources (511 strings)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
+
 apt (0.6.43.1) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@ -15,9 +41,11 @@ apt (0.6.43.1) unstable; urgency=low
   * apt-get source won't download already downloaded files again
     (closes: #79277)
   * share/debian-archive.gpg: new 2006 ftp-archive signing key added
+    (#345891)
   * redownload the Release file if IMS-Hit and gpg failure
+  * deal with multiple signatures on a Release file
 
- -- 
+ -- Michael Vogt <mvo@debian.org>  Fri,  6 Jan 2006 01:17:08 +0100
 
 apt (0.6.43) unstable; urgency=medium
 
@@ -111,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
@@ -196,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