* merged with matts tree

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d1a804e8051a50c9fbe400ed66b10404e013ced6..78b400954882ccf6df4bbbc91df9b76613bcedfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.40) unstable; urgency=low
+
+  * Patch from Jordi Mallach to mark some additional strings for translation
+  * Updated Catalan translation from Jordi Mallach
+  * Merge from bubulle@debian.org--2005/apt--main--0:
+    - Update pot and merge with *.po
+    - Updated French translation, including apt-key.fr.8
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 28 Jul 2005 11:57:32 -0700
+
 apt (0.6.39) unstable; urgency=low
 
   * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -5,8 +15,10 @@ apt (0.6.39) unstable; urgency=low
     michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
   * Merge aggregated translation updates:
     bubulle@debian.org--2005/apt--main--0
+  * Update priority of apt-utils to important, to match the override file
+  * Install only one keyring on each branch (Closes: #316119)
 
- -- 
+ -- Matt Zimmerman <mdz@debian.org>  Tue, 28 Jun 2005 11:51:09 -0700
 
 apt (0.6.38) unstable; urgency=low