* merged from the debian-sid bzr branch

* apt-pkg/depcache.cc:
  - Really release action groups only once (Closes: #622744)
  - Make purge work again for config-files (LP: #244598) (Closes: #150831)
* debian/apt.cron.daily:
  - Check power after wait, patch by manuel-soto (LP: #705269)
* debian/control:
  - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
    unpacked if a library is too old and thus break upgrades
* doc/apt-key.8.xml:
  - Document apt-key net-update (LP: #192810)
* apt-pkg/acquire-item.cc:
  - Only try to rename existing Release files (Closes: #622912)
* apt-pkg/indexcopy.cc:
  - Use RealFileExists() instead of FileExists(), allows amongst other
    things a directory named Sources to exist on a CD-ROM (LP: #750694).
* apt-pkg/acquire-item.cc:
  - Use Release files even if they cannot be verified (LP: #704595)
* cmdline/apt-get.cc:
  - Do not install recommends for build-dep (Closes: #454479) (LP: #245273)
* apt-pkg/deb/deblistparser.cc:
  - Handle no space before "[" in build-dependencies (LP: #72344)
* apt-pkg/policy.cc:
  - Allow pinning by glob() expressions, and regular expressions
    surrounded by slashes (the "/" character) (LP: #399474)
    (Closes: #121132)
* debian/control:
  - Set Standards-Version to 3.9.2

* mirror method:
  - do not crash if the mirror file fails to download
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string
* debian/apt.cron.daily:
  - run unattended-upgrades even if there was a error during
    the apt-get update (LP: #676295)
* apt-pkg/pkgcache.cc:
  - use the native Architecture stored in the cache header instead of
    loading it from configuration as suggested by Julian Andres Klode

3 files changed, 86 insertions, 19 deletions

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 9048ca7fe..1dfaa04a3 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -305,6 +305,26 @@ debug_echo()
     fi
 }
 
+check_power(){
+    # laptop check, on_ac_power returns:
+    #       0 (true)    System is on main power
+    #       1 (false)   System is not on main power
+    #       255 (false) Power status could not be determined
+    # Desktop systems always return 255 it seems
+    if which on_ac_power >/dev/null; then
+        on_ac_power
+        POWER=$?
+        if [ $POWER -eq 1 ]; then
+	    debug_echo "exit: system NOT on main power"
+	    return 1
+        elif [ $POWER -ne 0 ]; then
+	    debug_echo "power status ($POWER) undetermined, continuing"
+        fi
+        debug_echo "system is on main power."
+    fi
+    return 0
+}
+
 # ------------------------ main ----------------------------
 
 # Backup the 7 last versions of APT's extended_states file
@@ -350,22 +370,7 @@ if [ "$VERBOSE" -ge 3 ]; then
     set -x
 fi
 
-# laptop check, on_ac_power returns:
-#       0 (true)    System is on main power
-#       1 (false)   System is not on main power
-#       255 (false) Power status could not be determined
-# Desktop systems always return 255 it seems
-if which on_ac_power >/dev/null; then
-    on_ac_power
-    POWER=$?
-    if [ $POWER -eq 1 ]; then
-	debug_echo "exit: system NOT on main power"
-	exit 0
-    elif [ $POWER -ne 0 ]; then
-	debug_echo "power status ($POWER) undetermined, continuing"
-    fi
-    debug_echo "system is on main power."
-fi
+check_power || exit 0
 
 # check if we can lock the cache and if the cache is clean
 if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then
@@ -416,6 +421,7 @@ do_cache_backup $BackupArchiveInterval
 # sleep random amount of time to avoid hitting the 
 # mirrors at the same time
 random_sleep
+check_power || exit 0
 
 # include default system language so that "apt-get update" will
 # fetch the right translated package descriptions
diff --git a/debian/changelog b/debian/changelog
index 7d50f4f37..54eb90bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,64 @@
+apt (0.8.14.1ubuntu1) oneiric; urgency=low
+
+  [ Michael Vogt ]
+  * merged from the debian-sid bzr branch
+  
+  [ Julian Andres Klode ]
+  * apt-pkg/depcache.cc:
+    - Really release action groups only once (Closes: #622744)
+    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+  * debian/apt.cron.daily:
+    - Check power after wait, patch by manuel-soto (LP: #705269)
+  * debian/control:
+    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+      unpacked if a library is too old and thus break upgrades
+  * doc/apt-key.8.xml:
+    - Document apt-key net-update (LP: #192810)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Apr 2011 17:55:20 +0200
+
+apt (0.8.14.1) unstable; urgency=low
+
+  * apt-pkg/acquire-item.cc:
+    - Only try to rename existing Release files (Closes: #622912)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 16 Apr 2011 14:36:10 +0200
+
+apt (0.8.14) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/indexcopy.cc:
+    - Use RealFileExists() instead of FileExists(), allows amongst other
+      things a directory named Sources to exist on a CD-ROM (LP: #750694).
+  * apt-pkg/acquire-item.cc:
+    - Use Release files even if they cannot be verified (LP: #704595)
+  * cmdline/apt-get.cc:
+    - Do not install recommends for build-dep (Closes: #454479) (LP: #245273)
+  * apt-pkg/deb/deblistparser.cc:
+    - Handle no space before "[" in build-dependencies (LP: #72344)
+  * apt-pkg/policy.cc:
+    - Allow pinning by glob() expressions, and regular expressions
+      surrounded by slashes (the "/" character) (LP: #399474)
+      (Closes: #121132)
+  * debian/control:
+    - Set Standards-Version to 3.9.2
+  
+  [ Michael Vogt ]
+  * mirror method:
+    - do not crash if the mirror file fails to download
+  * apt-pkg/aptconfiguration.cc:
+    - fix comparing for a empty string
+  * debian/apt.cron.daily:
+    - run unattended-upgrades even if there was a error during
+      the apt-get update (LP: #676295)
+
+  [ David Kalnischkies ]
+  * apt-pkg/pkgcache.cc:
+    - use the native Architecture stored in the cache header instead of
+      loading it from configuration as suggested by Julian Andres Klode
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 15 Apr 2011 14:28:15 +0200
+
 apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
 
   * apt-pkg/deb/dpkgpm.cc:
diff --git a/debian/control b/debian/control
index 36573da4b..e966c1e34 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
@@ -14,10 +14,10 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg
 Replaces: manpages-pl (<< 20060617-3~)
 Provides: ${libapt-pkg:provides}
-Recommends: ubuntu-keyring, gpg
+Recommends: ubuntu-keyring
 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 Description: Advanced front-end for dpkg