From: Michael Vogt Date: Mon, 2 May 2011 07:40:26 +0000 (+0200) Subject: * merged from the debian-sid bzr branch X-Git-Tag: 0.9.13.exp1ubuntu1~186 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f4fd0a1c34babf8fbac71bc3471b41b411e414b2?ds=sidebyside * merged from the debian-sid bzr branch * apt-pkg/depcache.cc: - Really release action groups only once (Closes: #622744) - Make purge work again for config-files (LP: #244598) (Closes: #150831) * debian/apt.cron.daily: - Check power after wait, patch by manuel-soto (LP: #705269) * debian/control: - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT unpacked if a library is too old and thus break upgrades * doc/apt-key.8.xml: - Document apt-key net-update (LP: #192810) * apt-pkg/acquire-item.cc: - Only try to rename existing Release files (Closes: #622912) * apt-pkg/indexcopy.cc: - Use RealFileExists() instead of FileExists(), allows amongst other things a directory named Sources to exist on a CD-ROM (LP: #750694). * apt-pkg/acquire-item.cc: - Use Release files even if they cannot be verified (LP: #704595) * cmdline/apt-get.cc: - Do not install recommends for build-dep (Closes: #454479) (LP: #245273) * apt-pkg/deb/deblistparser.cc: - Handle no space before "[" in build-dependencies (LP: #72344) * apt-pkg/policy.cc: - Allow pinning by glob() expressions, and regular expressions surrounded by slashes (the "/" character) (LP: #399474) (Closes: #121132) * debian/control: - Set Standards-Version to 3.9.2 * mirror method: - do not crash if the mirror file fails to download * apt-pkg/aptconfiguration.cc: - fix comparing for a empty string * debian/apt.cron.daily: - run unattended-upgrades even if there was a error during the apt-get update (LP: #676295) * apt-pkg/pkgcache.cc: - use the native Architecture stored in the cache header instead of loading it from configuration as suggested by Julian Andres Klode --- f4fd0a1c34babf8fbac71bc3471b41b411e414b2 diff --cc debian/changelog index 7d50f4f37,15b270791..54eb90bc0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,39 -1,60 +1,100 @@@ -apt (0.8.14.2) UNRELEASED; urgency=low ++apt (0.8.14.1ubuntu1) oneiric; urgency=low + ++ [ Michael Vogt ] ++ * merged from the debian-sid bzr branch ++ ++ [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + - -- Julian Andres Klode Mon, 18 Apr 2011 10:54:11 +0200 ++ -- Michael Vogt Fri, 29 Apr 2011 17:55:20 +0200 + + apt (0.8.14.1) unstable; urgency=low + + * apt-pkg/acquire-item.cc: + - Only try to rename existing Release files (Closes: #622912) + + -- Julian Andres Klode Sat, 16 Apr 2011 14:36:10 +0200 + + apt (0.8.14) unstable; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + * apt-pkg/acquire-item.cc: + - Use Release files even if they cannot be verified (LP: #704595) + * cmdline/apt-get.cc: + - Do not install recommends for build-dep (Closes: #454479) (LP: #245273) + * apt-pkg/deb/deblistparser.cc: + - Handle no space before "[" in build-dependencies (LP: #72344) + * apt-pkg/policy.cc: + - Allow pinning by glob() expressions, and regular expressions + surrounded by slashes (the "/" character) (LP: #399474) + (Closes: #121132) + * debian/control: + - Set Standards-Version to 3.9.2 + + [ Michael Vogt ] + * mirror method: + - do not crash if the mirror file fails to download + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Julian Andres Klode Fri, 15 Apr 2011 14:28:15 +0200 + +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray Wed, 20 Apr 2011 15:05:12 -0700 + +apt (0.8.13.2ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Michael Vogt Thu, 07 Apr 2011 12:52:21 +0200 + +apt (0.8.13.2ubuntu1) natty; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + + -- Michael Vogt Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] diff --cc debian/control index 36573da4b,6d0f16b70..e966c1e34 --- a/debian/control +++ b/debian/control @@@ -14,10 -13,10 +14,10 @@@ Vcs-Browser: http://bzr.debian.org/logg Package: apt Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${shlibs:Depends} -Depends: debian-archive-keyring, ${misc:Depends}, gnupg ++Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} - Recommends: ubuntu-keyring, gpg ++Recommends: ubuntu-keyring Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg