From: Michael Vogt Date: Wed, 18 Jan 2006 22:28:51 +0000 (+0000) Subject: * merged from main X-Git-Tag: 0.7.24ubuntu1~274 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a3972f18ff561755a5152b5ee6f65a7eb1bf99b5 * merged from main Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120 * added debian-archive-keyring to recommends --- a3972f18ff561755a5152b5ee6f65a7eb1bf99b5 diff --cc configure.in index b900cc165,0d80e5ed9..a21a6285a --- 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.43.1ubuntu2") -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index c83806727,ee0d65605..dee768a35 --- a/debian/changelog +++ b/debian/changelog @@@ -11,13 -11,12 +11,13 @@@ apt (0.6.43.1ubuntu1) dapper; urgency=l - *.po: Updated from sources (511 strings) * add patch to fix http download corruption problem (thanks to Petr Vandrovec, closes: #280844, #290694) - * added debian-archive-keyring to the Recommends (closes: #347970) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") - -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + -- apt (0.6.43.1) unstable; urgency=low - + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: * fr.po: Completed to 510 strings * it.po: Completed to 510t diff --cc debian/control index 5c76a90eb,3b8883f88..4f3863d72 --- a/debian/control +++ b/debian/control @@@ -13,6 -13,7 +13,7 @@@ Depends: ${shlibs:Depends Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Recommends: debian-archive-keyring ++Recommends: ubuntu-keyring Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg