* added APT::Authentication::Trust-CDROM option

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9194b8a139f87f74165b33481d42337e8ce78251..78a7f890af2c778744018c7f8bbeaa62a52f67a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,22 @@ 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 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
+  * 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 (Closes: #333299)
+  * 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)
+  * support for apt-get source -t (and honor pining) (closes: #152129)
+  * added "APT::Authentication::Trust-CDROM" option to make the life
+    for the installer people easier (closes: #334656)
+  
+ --
 
 apt (0.6.41) unstable; urgency=low