summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:06:40 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:06:40 +0100
commite4b16ac68196eab5e58abf715459fe70c199cff3 (patch)
tree12702a5b543249f7204d476791615d3828bb2a9f /debian
parentf3ceaca7a648f7d93fa88106910151e69f498801 (diff)
parentac81ae9c07b7f2c3cc5afa76b197086814186557 (diff)
* 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
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5cff0919a..8c5cbac7c 100644
--- 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: