summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:07:43 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:07:43 +0100
commit9307ef07498d37c0b5e05b036195abaf7ad0105c (patch)
treecf85e1f46b31161dc4c601fa79fc76a85154d696 /debian
parent1eb5622017241e874016b759625b2b706ed9a74c (diff)
parente4b16ac68196eab5e58abf715459fe70c199cff3 (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 cf1977286..9b3bd724c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,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: