merged from apt--mvo

diff --combined cmdline/apt-key
index 7d6f9c589e44b335b1ad98fc9303f806f707f74b,6dd9fd8aabf2a043e197a1fb219eefb1e0dfc8b2..77a2a4623e1c824a1ed26139cb89cacc7e2ce127
--- 1/cmdline/apt-key
--- 2/cmdline/apt-key
+++ b/cmdline/apt-key
@@@ -9,10 -9,13 +9,10 @@@ GPG_CMD="gpg --ignore-time-conflict --n
  GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
  
  
 -MASTER_KEYRING=""
 -ARCHIVE_KEYRING_URI=""
 -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
 -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
 -
 -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 -REMOVED_KEYS=/usr/share/keyrings/debian-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/project/ubuntu-archive-keyring.gpg
  
  add_keys_with_verify_against_master_keyring() {
      ADD_KEYRING=$1
@@@ -69,6 -72,7 +69,7 @@@ net_update() 
      fi
      new_mtime=$(stat -c %Y $keyring)
      if [ $new_mtime -ne $old_mtime ]; then
+       echo "Checking for new archive signing keys now"
        add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
      fi
  }
@@@ -76,7 -80,7 +77,7 @@@
  update() {
      if [ ! -f $ARCHIVE_KEYRING ]; then
        echo >&2 "ERROR: Can't find the archive-keyring"
 -      echo >&2 "Is the debian-archive-keyring package installed?"
 +      echo >&2 "Is the ubuntu-keyring package installed?"
        exit 1
      fi