From: Michael Vogt Date: Thu, 10 Jun 2010 12:01:18 +0000 (+0200) Subject: merged from david X-Git-Tag: 0.8.0~9^2~38 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e934f8c63aabf4ff94962a4602c143b52b19b3cb?hp=-c merged from david --- e934f8c63aabf4ff94962a4602c143b52b19b3cb diff --combined debian/changelog index 9135d523b,f9638b78f..cfb7c814f --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,4 +1,4 @@@ --apt (0.7.26~exp6) UNRELEASED; urgency=low ++apt (0.7.26~exp6) experimental; urgency=low [ Michael Vogt ] * merge the remaining Ubuntu change: @@@ -8,7 -8,7 +8,7 @@@ that use round robin DNS) - support Original-Maintainer in RewritePackageOrder - enable cdrom autodetection via libudev by default - - show messsage about Vcs in use when apt-get source is run for + - show message about Vcs in use when apt-get source is run for packages maintained in a Vcs - better support transitional packages with mark auto-installed. when the transitional package is in "oldlibs" the new package @@@ -47,6 -47,7 +47,7 @@@ - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + - sent Last-Modified header also for Translation files * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator * ftparchive/writer.h: @@@ -81,8 -82,13 +82,13 @@@ looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file + * apt-pkg/policy.cc: + - get the candidate right for a not-installed pseudo package if + his non-pseudo friend is installed + * apt-pkg/indexcopy.cc: + - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 10:52:31 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 21:15:46 +0200 apt (0.7.26~exp5) experimental; urgency=low