From: Michael Vogt Date: Mon, 24 Aug 2009 11:30:05 +0000 (+0200) Subject: merged from the mvo branch X-Git-Tag: 0.7.24ubuntu1~8 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f408836a80f20359c87d8815608af651199e3d73 merged from the mvo branch --- f408836a80f20359c87d8815608af651199e3d73 diff --cc debian/apt.cron.daily index 980bfbb9d,b6099ee75..328282a41 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@@ -4,17 -2,58 +4,58 @@@ #set -e # # This file understands the following apt configuration variables: + # Values here are the default. + # Create /etc/apt/apt.conf.d/02periodic file to set your preference. # - # "APT::Periodic::Update-Package-Lists=1" + # Dir "/"; + # - RootDir for all configuration files + # + # Dir::Cache "var/apt/cache/"; + # - Set apt package cache directory + # + # Dir::Cache::Archive "archives/"; + # - Set package archive directory + # + # APT::Periodic::Enable "1"; + # - Enable the update/upgrade script (0=disable) + # + # APT::Periodic::BackupArchiveInterval "0"; + # - Backup after n-days if archive contents changed.(0=disable) + # + # APT::Periodic::BackupLevel "3"; + # - Backup level.(0=disable), 1 is invalid. + # + # Dir::Cache::Backup "backup/"; + # - Set periodic package backup directory + # + # APT::Archives::MaxAge "0"; (old, deprecated) + # APT::Periodic::MaxAge "0"; (new) + # - Set maximum allowed age of a cache package file. If a cache + # package file is older it is deleted (0=disable) + # + # APT::Archives::MinAge "2"; (old, deprecated) + # APT::Periodic::MinAge "2"; (new) + # - Set minimum age of a package file. If a file is younger it + # will not be deleted (0=disable). Usefull to prevent races + # and to keep backups of the packages for emergency. + # + # APT::Archives::MaxSize "0"; (old, deprecated) + # APT::Periodic::MaxSize "0"; (new) + # - Set maximum size of the cache in MB (0=disable). If the cache + # is bigger, cached package files are deleted until the size + # requirement is met (the biggest packages will be deleted + # first). + # + # APT::Periodic::Update-Package-Lists "0"; # - Do "apt-get update" automatically every n-days (0=disable) # -# APT::Periodic::Download-Upgradeable-Packages "0"; +# "APT::Periodic::Download-Upgradeable-Packages=0", # - Do "apt-get upgrade --download-only" every n-days (0=disable) - # - # "APT::Periodic::AutocleanInterval" - # - Do "apt-get autoclean" every n-days (0=disable) # - # "APT::Periodic::Unattended-Upgrade" + # APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; + # - Use debdelta-upgrade to download updates if available (0=disable) + # + # APT::Periodic::Unattended-Upgrade "0"; # - Run the "unattended-upgrade" security upgrade script # every n-days (0=disabled) # Requires the package "unattended-upgrades" and will write diff --cc debian/changelog index 01fc6e2c7,6692191d1..dbd8fe5b3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,22 -1,50 +1,59 @@@ - apt (0.7.23ubuntu1) karmic; urgency=low + apt (0.7.22.3) UNRELEASED; urgency=low + [ Eugene V. Lyubimkin ] + * methods/{http,https,ftp}, doc/apt.conf.5.xml: + - Changed and unified the code that determines which proxy to use. Now + 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, + and '{http,ftp}_proxy' environment variables are used only if options + mentioned above are not specified. + (Closes: #445985, #157759, #320184, #365880, #479617) + [ Michael Vogt ] - * merged from the debian-sid bzr branch - - * cmdline/apt-get.cc: - - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) + * apt-pkg/pkgcache.cc: + - do not set internel "needs-configure" state for packages in + triggers-pending state. dpkg will deal with the trigger and + it if does it before we trigger it, dpkg will error out + (LP: #414631) + [ Matt Zimmerman ] + * apt-pkg/deb/dpkgpm.cc: + - Suppress apport reports on dpkg short reads (these I/O errors are not + generally indicative of a bug in the packaging) + + [ Brian Murray ] + * cmdline/apt-get.cc: + - typo fix (LP: #370094) + - -- Matt Zimmerman Thu, 06 Aug 2009 16:37:04 +0100 + -- Michael Vogt Wed, 19 Aug 2009 11:14:15 +0200 + + apt (0.7.22.2) unstable; urgency=low + + * debian/apt.cron.daily: + - Make sure that VERBOSE is always set (Closes: #539366) + - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) + - Support using debdelta to download packages (Closes: #532079) + + -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 + + apt (0.7.22.1) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem), also Closes: #535362. + + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on + non-Linux architectures as it uses mremap (Closes: #539742). + * apt-pkg/sourcelist.cc: + - Only warn about missing sources.list if there is no sources.list.d + and vice versa as only one of them is needed (Closes: #539731). + * debian/control: + - Add myself to Uploaders. + - Increase Standards-Version to 3.8.2.0. + + -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low diff --cc debian/control index 03cc52d87,cb20e2864..6587c2eb6 --- a/debian/control +++ b/debian/control @@@ -1,14 -1,13 +1,13 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno - Standards-Version: 3.8.1.0 + Luca Bruno , Julian Andres Klode + Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, intltool - Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any