* merged with apt--mvo--0

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ac1e0e663fe10ca2230117a39fcca6fdf885d10d..064d240b5588a39eddf4506a35dbeb0c789f517b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,17 @@ apt (0.6.41.1) unstable; urgency=low
   * allow cdrom failures and fallback to other sources in that case
     (closes: #44135)
   * better error text when dpkg-source fails 
-  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
     - patch-99: Added Galician translation
     - patch-100: Completed Danish translation (Closes: #325686)
     - patch-104: French translation completed
-  * applied frensh man-page update (thanks to Philippe Batailler)
+    - patch-109: Italian translation completed
+    - patch-112: Swedish translation update
+    - patch-115: Basque translation completed
+  * applied french man-page update (thanks to Philippe Batailler)
+    (closes: #316318, #327456)
+  * fix leak in the mmap code, thanks to Daniel Burrows for the
+    patch (closes: #250583)
   
  -- 
 
@@ -95,6 +101,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