diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-22 17:34:41 +0100 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-03-22 17:34:41 +0100 |
commit | 51b2a0fc603c8e4fe667bf7a278bd1ce151e38a3 (patch) | |
tree | e7d3d0fef6eb31a06696a280bbda894491f20c3e /debian | |
parent | b058a788c4f976ea98e20b853853929f47d4bc3e (diff) | |
parent | b7a6594d1e5ed199a7a472b78b33e070375d6f92 (diff) |
merge with debian-sid (some version screw going on here)
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 127152b09..72ecc2f27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -203,6 +203,10 @@ apt (0.8.16~exp10) experimental; urgency=low * apt-pkg/contrib/fileutl.h: - store the offset in the internal fd before calculate size of the zlib-handled file to jump back to this place again + * apt-pkg/aptconfiguration.cc: + - parse dpkg --print-foreign-architectures correctly in + case archs are separated by newline instead of space, too. + (Closes: #655590) [ Michael Vogt ] * apt-pkg/contrib/fileutl.h: @@ -451,19 +455,20 @@ apt (0.8.16~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200 -apt (0.8.15.10) UNRELEASEDunstable; urgency=low +apt (0.8.15.10) unstable; urgency=high [ David Kalnischkies ] * algorithms.cc: - show a debug why a package was kept by ResolveByKeep() * doc/manpage-style.xml: - put <brackets> around email addresses - * apt-pkg/aptconfiguration.cc: - - parse dpkg --print-foreign-architectures correctly in - case archs are separated by newline instead of space, too. - (Closes: #655590) * doc/po/de.po: - apply typo-fix from Michael Basse, thanks! (LP: #900770) + * apt-pkg/acquire-item.cc: + - remove 'old' InRelease file if we can't get a new one before + proceeding with Release.gpg to avoid the false impression of a still + trusted repository by a (still present) old InRelease file. + Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) [ Chris Leick ] * German manpage translation update @@ -475,8 +480,16 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low * Slovak (Ivan Masar). Closes: #652985 * Russian (Yuri Kozlov). Closes: #654844 * Hungarian (Gabor Kelemen). Closes: #655238 + * Polish (Michał Kułach). Closes: #656908 + * Danish (Joe Hansen). Closes: #658643 + * French: replace "étiquetage" by "épinglage" for "pinning" + + [ Michael Vogt ] + * merged patch from lp:~uusijani/apt/uusi-branch: + Correct fi translation for hash sum mismatches (lp:420403) + Thanks to Jani Uusitalo - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:30:36 +0100 + -- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 14:14:26 +0100 apt (0.8.15.9) unstable; urgency=low |