* merged with apt--mvo--0

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e88689667993fb591ea76c22c7517c1ffcf4506c..064d240b5588a39eddf4506a35dbeb0c789f517b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,22 @@ apt (0.6.41.1) unstable; urgency=low
 
   * apt-pkg/cdrom.cc:
     - unmount the cdrom when apt failed to locate any package files
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
+  * 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-115:
+    - patch-99: Added Galician translation
+    - patch-100: Completed Danish translation (Closes: #325686)
+    - patch-104: French translation completed
+    - 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)
+  
+ -- 
 
 apt (0.6.41) unstable; urgency=low
 
@@ -87,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