From: Michael Vogt Date: Wed, 13 Feb 2008 18:52:12 +0000 (+0100) Subject: cmdline/apt-key: import net_update key from the project/ directory for now X-Git-Tag: 0.7.24ubuntu1~88 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fd9a8ca2ed30994a7946acbf54f25d27fe2b10cb cmdline/apt-key: import net_update key from the project/ directory for now --- diff --git a/cmdline/apt-key b/cmdline/apt-key index e0c4b5e48..7d6f9c589 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -12,7 +12,7 @@ GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg -ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/ubuntu-archive-keyring.gpg +ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 diff --git a/configure.in b/configure.in index 890643a3e..2e3fa05e8 100644 --- a/configure.in +++ b/configure.in @@ -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.9ubuntu8") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu10") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 12b6d6306..1e3a71dd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.9ubuntu10) hardy; urgency=low * 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