From: Michael Vogt Date: Mon, 5 May 2008 09:21:13 +0000 (+0200) Subject: merged from debian X-Git-Tag: 0.7.24ubuntu1~70 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a2ec4d22dd77a363cd5b1f8b55ed34ba88331396 merged from debian --- a2ec4d22dd77a363cd5b1f8b55ed34ba88331396 diff --cc configure.in index f238ef3be,c0c73e1c8..fbfb2fca2 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu17") -AC_DEFINE_UNQUOTED(VERSION,"0.7.13") ++AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index a4985768d,0a42c92ae..1bf5cc953 --- a/debian/changelog +++ b/debian/changelog @@@ -1,264 -1,209 +1,473 @@@ -apt (0.7.14) UNRELEASED; urgency=low ++apt (0.7.14ubuntu1) intrepid; urgency=low + ++ [ Michael Vogt ] ++ * merged from debian/sid ++ + [ Christian Perrier ] + * Mark a message from dselect backend as translatable + Thanks to Frédéric Bothamy for the patch + Closes: #322470 + + [ Program translations ] + * Simplified Chinese updated. Closes: #473360 + * Catalan fixes. Closes: #387141 + * Typo fix in Greek translation. Closes: #479122 + * French updated. + * Thai updated. Closes: #479313 + * Italian updated. Closes: #479326 + * Polish updated. Closes: #479342 + * Bulgarian updated. Closes: #479379 + * Finnish updated. Closes: #479403 + * Korean updated. Closes: #479426 + * Basque updated. Closes: #479452 + + -- Christian Perrier Sun, 04 May 2008 08:31:06 +0200 + + apt (0.7.13) unstable; urgency=low + + [ Otavio Salvador ] + * Add missing build-depends back from build-depends-indep field. + Closes: #478231 + * Make cron script quiet if cache is locked. Thanks to Ted Percival + for the patch. Closes: #459344 + * Add timeout support for https. Thanks to Andrew Martens + for the patch. + + [ Goswin von Brederlow ] + * Add support for --no-download on apt-get update. Closes: #478517 + + [ Program translations ] + - Vietnamese updated. Closes: #479008 + + -- Otavio Salvador Fri, 02 May 2008 14:46:00 -0300 + + apt (0.7.12) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild - * apt-pkg/algorithms.cc: ++ * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * apt-pkg/deb/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + * methods/connect.cc: + - remember hosts with Resolve failures or connect Timeouts + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard + * doc/apt_preferences.5.xml: + - fix typo + * added debian/README.source + + [ Christian Perrier ] + * Fix typos in manpages. Thanks to Daniel Leidert for the fixes + Closes: #444922 + * Fix syntax/copitalisation in some messages. Thanks to Jens Seidel + for pointing this and providing the patch. + Closes: #466845 + * Fix Polish offline translation. Thanks to Robert Luberda for the patch + and apologies for applying it very lately. Closes: #337758 + * Fix typo in offline.sgml. Closes: #412900 + + [ Program translations ] + - German updated. Closes: #466842 + - Swedish updated. + - Polish updated. Closes: #469581 + - Slovak updated. Closes: #471341 + - French updated. + - Bulgarian updated. Closes: #448492 + - Galician updated. Closes: #476839 - ++ + [ Daniel Burrows ] + * apt-pkg/depcache.cc: + - Patch MarkInstall to follow currently satisfied Recommends even + if they aren't "new", so that we automatically force upgrades + when the version of a Recommends has been tightened. (Closes: #470115) + - Enable more complete debugging information when Debug::pkgAutoRemove + is set. + * apt-pkg/contrib/configuration.cc + - Lift the 1024-byte limit on lines in configuration files. + (Closes: #473710, #473874) + * apt-pkg/contrib/strutl.cc: + - Lift the 64000-byte limit on individual messages parsed by ReadMessages. + (Closes: #474065) + * debian/rules: + - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto. + + -- Daniel Burrows Sat, 26 Apr 2008 12:24:35 -0700 - ++ + apt (0.7.11) unstable; urgency=critical + + [ Raise urgency to critical since it fixes a critical but for Debian + Installer Lenny Beta1 release ] + + [ Program translations ] + - Vietnamese updated. Closes: #460825 + - Basque updated. Closes: #461166 + - Galician updated. Closes: #461468 + - Portuguese updated. Closes: #464575 + - Korean updated. Closes: #448430 + - Simplified Chinese updated. Closes: #465866 + + [ Otavio Salvador ] + * Applied patch from Robert Millan to fix the error + message when gpgv isn't installed, closes: #452640. + * Fix regression about APT::Get::List-Cleanup setting being ignored, + closes: #466052. + + -- Otavio Salvador Thu, 17 Jan 2008 22:36:46 -0200 + + apt (0.7.10) unstable; urgency=low + + [ Otavio Salvador ] + * Applied patch from Mike O'Connor to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + * Applied patch from Aurelien Jarno to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + * Fix compilation warnings in apt-pkg/cdrom.cc and + apt-pkg/contrib/configuration.cc. + * Fix typo in debian/copyright file ("licened" instead of "licensed"), + closes: #458966. + + [ Program translations ] + - Basque updated. Closes: #453088 + - Vietnamese updated. Closes: #453774, #459013 + - Japanese updated. Closes: #456909 + - Simplified Chinese updated. Closes: #458039 + - French updated. + - Norwegian Bokmål updated. Closes: #457917 - + [ Michael Vogt ] + * debian/rules + - fix https install location + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * apt-pkg/packagemanager.{cc,h}: - - propergate the Immediate flag to make hitting the ++ - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output - ++ + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thanks to Michael Gilbert + for the patch. Closes: #260825 ++ ++ -- Michael Vogt Thu, 03 Jan 2008 11:31:45 +0100 ++ +apt (0.7.9ubuntu17) hardy-proposed; urgency=low + + * apt-pkg/acquire-item.cc: + - fix signaure removal on transient network failures LP: #220627 + (thanks to Scott James Remnant) + + -- Michael Vogt Tue, 22 Apr 2008 16:32:49 +0200 + +apt (0.7.9ubuntu16) hardy; urgency=low + + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) + + -- Michael Vogt Tue, 08 Apr 2008 14:17:14 +0200 + +apt (0.7.9ubuntu15) hardy; urgency=low + + * cmdline/apt-get.cc: + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies. This should + fix livecd building for kubuntu (thanks to Jonathan Riddell + for reporting the problem) + + -- Michael Vogt Thu, 13 Mar 2008 23:25:45 +0100 + +apt (0.7.9ubuntu14) hardy; urgency=low + + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + - run the problemResolver after a task was installed + so that it can correct any missing dependencies + * typo fixes (LP: #107960) + + -- Michael Vogt Tue, 11 Mar 2008 21:46:07 +0100 + +apt (0.7.9ubuntu13) hardy; urgency=low + + [ Lionel Porcheron ] + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) + + [ Michael Vogt ] + * doc/apt_preferences.5.xml: + - fix typo (LP: #150900) + * doc/example/sources.list: + - updated for hardy (LP: #195879) + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard + + -- Michael Vogt Tue, 04 Mar 2008 15:35:09 +0100 + +apt (0.7.9ubuntu12) hardy; urgency=low + + * debian/apt.cron.daily: + - use admin user proxy settings + * cmdline/apt-get.cc: + - fix task installation (thanks to Colin Watson) + + -- Michael Vogt Thu, 21 Feb 2008 15:07:44 +0100 + +apt (0.7.9ubuntu11) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + (LP: #188127) - -- Michael Vogt Mon, 07 Jan 2008 21:40:47 +0100 + -- Michael Vogt Thu, 10 Jan 2008 12:06:12 +0100 + +apt (0.7.9ubuntu10) hardy; urgency=low + + * cmdline/apt-key: + - add "net-update" command that fetches the + ubuntu-archive-keyring.gpg and add keys from it that are + signed by the ubuntu-master-keyring.gpg + (apt-archive-key-signatures spec) + * debian/apt.cron.daily: + - add apt-key net-update to the nightly cron job + + -- Michael Vogt Wed, 13 Feb 2008 15:50:28 +0100 + +apt (0.7.9ubuntu9) hardy; urgency=low + + * fix FTBFS due to incorrect intltool build-depends + + -- Michael Vogt Mon, 11 Feb 2008 16:04:37 +0100 + +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt Mon, 11 Feb 2008 14:04:56 +0100 + +apt (0.7.9ubuntu7) hardy; urgency=low + + * methods/connect.cc: + - remember hosts with Resolve failures or connect Timeouts + see https://wiki.ubuntu.com/NetworklessInstallationFixes + * cmdlines/apt-key: + - fix bug in the new apt-key update code that imports only + keys signed with the master key (thanks to cjwatson) + + -- Michael Vogt Fri, 08 Feb 2008 11:38:35 +0100 + +apt (0.7.9ubuntu6) hardy; urgency=low + + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * apt-pkg/deb/dpkgpm.cc: + - add APT::Apport::MaxReports to limit the maximum number + of reports generated in a single run (default to 3) + * apt-pkg/deb/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + + -- Michael Vogt Mon, 04 Feb 2008 14:28:02 +0100 + +apt (0.7.9ubuntu5) hardy; urgency=low + + * Merged apt-authentication-reliabilty branch. This means + that apt will refuse to update and use the old lists if + the authentication of a repository that used to be + authenticated fails. See + https://wiki.ubuntu.com/AptAuthenticationReliability + for more details. + + -- Michael Vogt Wed, 16 Jan 2008 10:36:10 +0100 + +apt (0.7.9ubuntu4) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to + true, the effect of the compatibility code was to require both of them + to be set to false in order to disable list cleanup; this broke the + installer. Instead, disable list cleanup if either of them is set to + false. + + -- Colin Watson Wed, 09 Jan 2008 22:34:37 +0000 + +apt (0.7.9ubuntu3) hardy; urgency=low + + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + -- Michael Vogt Mon, 07 Jan 2008 19:02:11 +0100 + +apt (0.7.9ubuntu2) hardy; urgency=low + + [ Otavio Salvador ] + * Applied patch from Aurelien Jarno to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + [ Program translations ] + - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. + + [ Michael Vogt ] + * apt-pkg/packagemanager.{cc,h}: + - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder. (LP: #179247) + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) - ++ + -- Michael Vogt Thu, 03 Jan 2008 11:31:45 +0100 - ++ +apt (0.7.9ubuntu1) hardy; urgency=low + + * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining + changes: + - mirror download method (pending merge with debian) + - no pdiff download by default (unsuitable for ubuntu) + - no recommends-by-default yet + - add "Original-Maintainer" field to tagfile + - show warning on apt-get source if the package is maintained + in a VCS (pedinging merge with debian) + - use ubuntu-archive keyring instead of debians one + - support metapackages section for autoremoval + - debian maintainer field change + - send ubuntu string in user-agent + + * Changes from the debian-sid bzr branch (but not uploaded to debian + yet): + + [ Otavio Salvador ] + * Applied patch from Mike O'Connor to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + + [ Program translations ] + - Basque updated. Closes: #453088 + + [ Michael Vogt ] + * debian/rules + - fix https install location + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * methods/mirror.{cc,h}: + - only update mirror list on IndexFile updates + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + -- Michael Vogt Thu, 13 Dec 2007 14:46:27 +0100 apt (0.7.9) unstable; urgency=low diff --cc debian/control index 3af811010,a3c84d72a..a1c94ddd0 --- a/debian/control +++ b/debian/control @@@ -1,13 -1,11 +1,12 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 - Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), intltool - Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) - XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu + 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-1), xsltproc, docbook-xsl, xmlto -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ ++Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any diff --cc doc/examples/configure-index index cbede198b,c20011c9c..a6ad56067 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -193,22 -190,8 +193,22 @@@ Acquir gpgv { - Options {"--ignore-time-conflict";} // not very usefull on a normal system + Options {"--ignore-time-conflict";} // not very useful on a normal system }; + + mirror + { + RefreshInterval "360"; // refresh interval in minutes + MaxAge "90"; // max age for a mirror file in days before + // it gets deleted + // mirror failure reporting script + ProblemReporting "/usr/lib/apt/apt-report-mirror-failure"; + // mirror failure reporting url + ReportFailures "http://example.com/mirror-failure"; + }; + + // translations can be set here to "none", "environment" or "$locale" + Translation "none"; }; // Directory layout