diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
commit | b3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch) | |
tree | 0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /debian | |
parent | a1a253e8be978998b66af62240a25864db2cc694 (diff) | |
parent | 128aa7d3630f138f37ef83e3e8564feca01ec429 (diff) |
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6482485b6..d63fac6b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,31 @@ -apt (1.0ubuntu1) trusty; urgency=low +apt (1.0.1ubuntu1) trusty; urgency=low - * merge with debian/sid + * merge with the debian/sid 1.0.1 version + (LP: #1302033) -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 01 Apr 2014 17:48:58 +0200 +apt (1.0.1) unstable; urgency=medium + + [ Michael Vogt ] + * Fix crash in "apt list" when a sources.list file is unreable + (Closes: 743413) + * make apt search case-insensitive by default + * Fix possible race when stunnel/aptwebserver create their PID files + in the tests + * Fix insecure file permissions when using FileFd with OpenMode::Atomic + (LP: #1304657) + + [ Julian Andres Klode ] + * Version the Breaks/Replaces for sun-java{5,6}-jdk (LP: #1302736) + (Closes: #743616) + * Add versioned openjdk-6-jdk breaks + + [ Josef Vitu ] + * apt: Minor typo in 'apt' man page (closes: #743657) + + -- Michael Vogt <mvo@debian.org> Thu, 10 Apr 2014 09:48:56 +0200 + apt (1.0) unstable; urgency=low The "Happy birthday and 10000b years in the making" release |