summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-07 11:04:17 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-07 11:04:17 +0100
commit777b4ac6882b40f63f1aa9b6f4da78b8fdc56cbe (patch)
tree3cb631b8c36aef5f0892a92d4ed54efdbdfccd01 /debian
parent5085e660679cdbb51783702898c42000d5db4fba (diff)
parent278835da0bbab11f57a9938d4193b66067c6eff1 (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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 417cd2436..685c048ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ apt (0.7.22.4) unstable; 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.
[ Brian Murray ]
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: