merged from debian-sid

diff --cc cmdline/apt-key
index 288fb52fb6dda148f96a439e34613e82c24ca986,843163f82c5fc3367f9a4d023817763888af8312..113f9ab1baa5f230cc42af455d1fbfc5939a6e39
--- 1/cmdline/apt-key
--- 2/cmdline/apt-key
+++ b/cmdline/apt-key
@@@ -13,14 -13,21 +13,21 @@@ f
  
  GPG="$GPG_CMD"
  
 -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
 +# ubuntu keyrings
 +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
 +
  
+ requires_root() {
+       if [ "$(id -u)" -ne 0 ]; then
+               echo >&1 "ERROR: This command can only be used by root."
+               exit 1
+       fi
+ }
+ 
  add_keys_with_verify_against_master_keyring() {
      ADD_KEYRING=$1
      MASTER=$2
@@@ -90,9 -98,10 +98,10 @@@ net_update() 
  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
+     requires_root
  
      # add new keys from the package;
  

diff --cc debian/changelog
index aa0a568c081280589f6997bd6bdb08a91ecb6f50,87d25e78ffdac0406c547b23928284ca2798bb53..5e1ae933031557c08486b35893a3dc84517957d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,26 +1,43 @@@
++apt (0.8.15.1ubuntu1) oneiric; urgency=low
++
++  * merge from debian/sid
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:16:12 +0100
++
+ apt (0.8.15.1) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * doc/makefile:
+     - create doxygen directory to avoid depending on magic (Closes: #628799)
+   * cmdline/apt-key:
+     - explicitly state that net-update is not supported if no url is set
+     - require to be root for add, rm, update and net-update
+     - clarify update vs. net-update in different distros (Closes: #632043)
+   * debian/apt.symbols:
+     - forgot 'mips' in the list for all architecture dependent symbols
+     - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
+     - the symbol for PrintStatus() is architecture dependent
+   * apt-pkg/policy.cc:
+     - do not segfault in pinning if a package with this name doesn't exist.
+       Thanks to Ferdinand Thommes for the report!
+     - Defaults is a vector of Pin not of PkgPin
+     - ensure that only the first specific stanza for a package is used
+     - save all stanzas which had no effect in Unmatched
+     - allow package:architecure in Package:
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
+ 
 +apt (0.8.15ubuntu1) oneiric; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:  
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 29 Jun 2011 09:03:39 +0100
 +
  apt (0.8.15) unstable; urgency=low
  
    [ Julian Andres Klode ]