* apt-pkg/acquire.{cc,h}:

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0701185b99381f532e5d30d45e280a60a83852e4..e0a735e2f207395297dd51f2df6fe9d8cc6a1135 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,26 @@ apt (0.6.46.4ubuntu11) UNRELEASED; urgency=low
       (LP#79165)
   * apt-pkg/acquire-item.cc:
     - if decompression of a index fails, delete the index (LP#68202)
-  * [internal-ABI] apt-pkg/acquire.{cc,h}:
+  * apt-pkg/acquire.{cc,h}:
     - deal better with duplicated sources.list entries (avoid
       double queuing of  URLs) - this fixes hangs in bzip/gzip
       (LP#102511)
+  * Fix broken use of awk in apt-key that caused removal of the wrong keys
+    from the keyring. Closes: #412572
+  * merged from Christian Perrier:
+    * mr.po: New Marathi translation  Closes: #416806
+    * zh_CN.po: Updated by Eric Pareja  Closes: #416822
+    * tl.po: Updated by Eric Pareja   Closes: #416638
+    * gl.po: Updated by Jacobo Tarrio
+             Closes: #412828
+    * da.po: Updated by Claus Hindsgaul
+             Closes: #409483
+    * fr.po: Remove a non-breakable space for usability
+             issues. Closes: #408877
+    * ru.po: Updated Russian translation. Closes: #405476
+    * *.po: Unfuzzy after upstream typo corrections
+  * apt-pkg/policy.cc:
+    - allow multiple packages (thanks to David Foerster)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 17 Apr 2007 15:53:37 +0200
 
@@ -122,6 +138,14 @@ apt (0.6.46.4ubuntu1) feisty; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
 
+apt (0.6.46.4-0.1) unstable; urgency=emergency
+  
+  * NMU
+  * Fix broken use of awk in apt-key that caused removal of the wrong keys
+    from the keyring. Closes: #412572
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Feb 2007 16:00:22 -0500
+
 apt (0.6.46.4) unstable; urgency=high
 
   * ack NMU (closes: #401017)