merge debian sid branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5cff0919ad30a2bdd6e454a18fd8530dfb0173f5..9b3bd724c6764210b2eafe92b44a09736ffea9e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ apt (0.7.25) UNRELEASED; urgency=low
     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:
@@ -30,6 +32,12 @@ apt (0.7.25) UNRELEASED; urgency=low
   * 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: