cmdline/apt-key: import net_update key from the project/ directory for now

diff --git a/cmdline/apt-key b/cmdline/apt-key
index e0c4b5e4854d505b0ea06584415785908e420a56..7d6f9c589e44b335b1ad98fc9303f806f707f74b 100755 (executable)
--- 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
 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
 
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1

diff --git a/configure.in b/configure.in
index 890643a3e90a696873c4f2a6c6b48075e14c6239..2e3fa05e88f313a3c657a8b0f330cdbd1d3ee250 100644 (file)
--- 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_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)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 12b6d63065f3e50282783da101d5f7a799d37c70..1e3a71dd3841140df1f67b6e153be710575c0a3a 100644 (file)
--- 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
 
   * debian/apt.cron.daily:
     - add apt-key net-update to the nightly cron job
 

- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Feb 2008 15:50:28 +0100

 
 apt (0.7.9ubuntu9) hardy; urgency=low
 
 
 apt (0.7.9ubuntu9) hardy; urgency=low