diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-20 16:32:48 +0100 |
| commit | bef425ae689899d3add1f6a26b888012803a7308 (patch) | |
| tree | 79ba0268c02129fbaaa1fb32c58904cb37ca1167 /debian/changelog | |
| parent | 74ac981563c6ccfd5291b6b6b83e193afa8aa40b (diff) | |
| parent | 1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
test/integration/test-kernel-helper-autoremove
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 4111d4505..d80e70dc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +apt (0.9.15.3ubuntu1) UNRELEASEDtrusty; urgency=low + + * merge with debian/sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Feb 2014 16:16:57 +0100 + +apt (0.9.15.3) unstable; urgency=medium + + [ Michael Vogt ] + * disable https->http redirects in libcurl, thanks to Julien Cristau + * ADT: use "Restrictions: allow-stderr and avoid apt-stderr.log in + debian/tests/run-tests + * test/integration/test-bug-723705-tagfile-truncates-fields: + - fix autopkgtest failure + * add missing canNotFindFnmatch/showFnmatchSelection + (for the next ABI break) + * disable fnmatch() matching from the commandline + * merge testcase for the autoremove feature from the ubuntu branch + + [ David Kalnischkies ] + * do not recommend dselect in apt-get manpage (Closes: 617625) + * report https download start only if we really get it + * allow http protocol to switch to https + * do not compress .xhtml files and remove junk files (Closes: 738933) + * simplify code some more to make reddit happy + * update symbols file with hints from the buildlogs + + -- Michael Vogt <mvo@debian.org> Thu, 20 Feb 2014 14:42:39 +0100 + apt (0.9.15.2ubuntu1) trusty; urgency=low * merge with debian/sid |