merge debian sid branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 68ee83bac8c23642f9142ebe0c796d004c82dce3..9b3bd724c6764210b2eafe92b44a09736ffea9e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,42 @@ apt (0.7.25) UNRELEASED; urgency=low
     Closes: #479997
   * Polish translation update by Wiktor Wandachowicz
     Closes: #548571
+  * German translation update by Holger Wansing
+    Closes: #551534
+  * German translation of manpages by Chris Leick
+    Closes: #552606
+  * Italian translation update by Milo Casagrande
+    Closes: #555797
+  * Simplified Chinese translation update by Aron Xu 
+    Closes: #558737
+  * Slovak translation update by Ivan Masár
+    Closes: #559277
   
   [ Michael Vogt ]
   * apt-pkg/packagemanager.cc:
     - fix overly aggressive immediate config propergation
       (thanks to David Kalnischkies)
+  * apt-pkg/packagemanager.cc:
+    - add output about pre-depends configuring when debug::pkgPackageManager
+      is used
+  * methods/https.cc:
+    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
+      thanks to Brian Thomason for the patch
+  * merge lp:~mvo/apt/netrc branch, this adds support for a
+    /etc/apt/auth.conf that can be used to store username/passwords
+    in a "netrc" style file (with the extension that it supports "/"
+    in a machine definition). Based on the maemo git branch.
+  * apt-pkg/deb/dpkgpm.cc:
+    - add "purge" to list of known actions
+
+  [ Brian Murray ]
+  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+    - typo fix (LP: #462328)
+  
+  [ Loïc Minier ]
+  * cmdline/apt-key:
+    - Emit a warning if removed keys keyring is missing and skip associated
+      checks (LP: #218971)
 
   [ Julian Andres Klode ]
   * doc/apt.conf.5.xml:
@@ -27,6 +58,10 @@ apt (0.7.25) UNRELEASED; urgency=low
   * methods/https.cc:
     - Add support for authentication using netrc (Closes: #518473), patch
       by Jussi Hakala <jussi.hakala@hut.fi>.
+  * ftparchive/apt-ftparchive.cc:
+    - Call setlocale() so translations are actually used.
+  * debian/apt.conf.autoremove:
+    - Add kfreebsd-image-* to the list (Closes: #558803)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200