diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
tree | d539d21c6716af3122edabae91feadccfb3c12ad /debian/changelog | |
parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a3948033c..66ce3cebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,27 @@ -apt (0.9.15.3ubuntu1) trusty; urgency=low +apt (0.9.15.4ubuntu1) UNRELEASEDtrusty; urgency=low * merge with debian/sid - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Feb 2014 16:32:57 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 23 Feb 2014 00:45:20 +0100 + +apt (0.9.15.4) unstable; urgency=low + + [ Michael Vogt ] + * remove auto-generated apt-key and sources.list on clean (closes: 739749) + * add testcase for Bug#718329 + * various fixes for ADT failures + + [ Jon Severinsson ] + * add apt-vendor information for tanglu + + [ Guillem Jover ] + * ExtractTar: Allow an empty decompressor program + * DebFile: Refactor ExtractTarMember() out from ExtractArchive() + * Add support for data.tar, control.tar and control.tar.xz + * debian: Add debDebFile::ExtractTarMember to the symbols file + * Fix typos in documentation (codespell) + + -- Michael Vogt <mvo@debian.org> Sun, 23 Feb 2014 00:27:12 +0100 apt (0.9.15.3) unstable; urgency=medium |