Sfoglia il codice sorgente

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

Michael Vogt 18 anni fa
parent
commit
fd9a8ca2ed
3 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 1 1
      cmdline/apt-key
  2. 1 1
      configure.in
  3. 1 1
      debian/changelog

+ 1 - 1
cmdline/apt-key

@@ -12,7 +12,7 @@ GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
 MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
 ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.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_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
     ADD_KEYRING=$1

+ 1 - 1
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)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu8")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu10")
 PACKAGE="apt"
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 AC_SUBST(PACKAGE)

+ 1 - 1
debian/changelog

@@ -8,7 +8,7 @@ apt (0.7.9ubuntu10) hardy; urgency=low
   * debian/apt.cron.daily:
   * debian/apt.cron.daily:
     - add apt-key net-update to the nightly cron job
     - 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