diff options
| author | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
| commit | 32120cde98308448fbcd31cf7841f13a86d3e0a8 (patch) | |
| tree | 102ec9f093480109c14d7f0450bc4a584d42a4c0 /debian | |
| parent | c1409d1be88557529c62883be3174793481233de (diff) | |
| parent | 9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file
Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a3dd9af41..d12e7071f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.15.5) unstable; urgency=medium + + [ Michael Vogt ] + * vendor/tanglu/makefile: add missing clean/sources.list + * run the acquire tests with the new apt-helper binary, this + fixes the autopkgtest failures + + [ Martin Pitt ] + * Fix autopkgtest missing dependencies and locale (closes: #739988) + + -- Michael Vogt <mvo@debian.org> Fri, 28 Feb 2014 08:44:25 +0100 + apt (0.9.15.4) unstable; urgency=low [ Michael Vogt ] |