* merge lp:~mvo/apt/netrc branch, this adds support for a

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5cff0919ad30a2bdd6e454a18fd8530dfb0173f5..8c5cbac7c652724bc65a5c40f67b858d2fcae6af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,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: