diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-09 10:16:32 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-09 10:16:32 +0100 |
| commit | 366cff695ae0a228300817e278c7ddf62ca52c34 (patch) | |
| tree | f1516a044d5ae14f14bb0c19c8cadd1815407898 /debian | |
| parent | 864cf8e52aa37de28f2fc9a66236713f1ba34409 (diff) | |
| parent | 777b4ac6882b40f63f1aa9b6f4da78b8fdc56cbe (diff) | |
merged from the mvo branch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3c93178f5..32d019cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,22 @@ apt (0.7.24ubuntu1) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - include df -l output in the apport log as well (thanks to tjaalton) + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used + * 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. - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Dec 2009 17:42:36 +0100 + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 09 Dec 2009 09:56:03 +0100 apt (0.7.24) unstable; urgency=low |