From: Matt Zimmerman Date: Wed, 29 Dec 2004 01:18:28 +0000 (+0000) Subject: Merge apt--mvo--0 X-Git-Tag: 0.7.24ubuntu1~368 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2ee99a54fd671f74b6ee24307e11ab0534580b87?ds=inline;hp=-c Merge apt--mvo--0 Patches applied: * michael.vogt@canonical.com--2004/apt--mvo--0--patch-5 * added apt-key update method * michael.vogt@canonical.com--2004/apt--mvo--0--patch-6 * if a sign-file download fails, delete the the partial download in "partial/" also * michael.vogt@canonical.com--2004/apt--mvo--0--patch-7 * changelog updated, version is now 0.6.27ubuntu4; added DEB_BUILD_PROG_OPTS to debian/rules * michael.vogt@canonical.com--2004/apt--mvo--0--patch-8 * removed Release.gpg files in partial/ before fetching a new one * michael.vogt@canonical.com--2004/apt--mvo--0--patch-9 * some comments about the pkgAcqMetaSig::Custom600Headers() added * michael.vogt@canonical.com--2004/apt--mvo--0--patch-10 * fix permissions in po/ * michael.vogt@canonical.com--2004/apt--mvo--0--patch-11 * use gpg --with-colons --- 2ee99a54fd671f74b6ee24307e11ab0534580b87 diff --combined configure.in index 6c81ae7f6,b46decc11..b40a53b7f --- 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.6.28") -AC_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu4") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.29") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/changelog index 26368db0e,421914b36..1551df078 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,14 +1,29 @@@ ++apt (0.6.29) unstable; urgency=low ++ ++ * Merge apt--mvo--0 (0.6.27ubuntu4) ++ ++ ++ -- Matt Zimmerman Tue, 28 Dec 2004 17:18:02 -0800 ++ +apt (0.6.28) hoary; urgency=low + + * Merge apt--mvo--0 + * Rebuild source to get rid of arch metadata and temporary files in + 0.6.27ubuntu3 + + -- Matt Zimmerman Thu, 23 Dec 2004 18:53:16 -0800 + + apt (0.6.27ubuntu4) hoary; urgency=low + + * remove old sig-file in partial/ before starting to fetch a new sig-file + (see ubuntu #4769 for the rational) + * added apt-key update method (uses ubuntu-keyring) + * documented the "--allow-unauthenticated" switch + * added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be + passed to DEB_BUILD_PROG like "-S") + + -- Michael Vogt Thu, 23 Dec 2004 11:12:51 +0100 + apt (0.6.27ubuntu3) hoary; urgency=low * added a exact dependency from libapt-pkg-dev to the apt version it was