From: Michael Vogt Date: Thu, 3 Jan 2008 12:48:03 +0000 (+0100) Subject: merge from apt--mvo X-Git-Tag: 0.7.24ubuntu1~112 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/bc87e700890863acd48fd61a5bc8dcc2386afd20 merge from apt--mvo --- bc87e700890863acd48fd61a5bc8dcc2386afd20 diff --cc configure.in index a2b554a0c,5f19c98a6..ebde69922 --- 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.9ubuntu1") -AC_DEFINE_UNQUOTED(VERSION,"0.7.10") ++AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index 9177aa826,4f22e9d92..40882faa6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,39 -1,41 +1,80 @@@ -apt (0.7.10) UNRELEASED; urgency=low ++apt (0.7.9ubuntu2) hardy; 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. ++ ++ [ 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 ] - - Basque updated. Closes: #453088 + - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. + + [ Michael Vogt ] - * debian/rules - - fix https install location ++ * 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 ++ ++ -- 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. - * Applied patch from Aurelien Jarno to fix building - with newest dpkg-shlibdeps changing the packaging building order, - closes: #452862. + + [ 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: diff --cc debian/control index 6c1453857,2e9e306c8..a93f76510 --- a/debian/control +++ b/debian/control @@@ -1,13 -1,12 +1,13 @@@ 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), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) + Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any