merged from apt--mvo

2 files changed, 35 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index ef9784178..497053111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,27 @@
-apt (0.7.10) UNRELEASED; urgency=low
+apt (0.7.11) UNRELEASED; urgency=low
+
+  [ Colin Watson ]
+  * apt-pkg/algorithms.cc:
+    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
+      true, the effect of the compatibility code was to require both of them
+      to be set to false in order to disable list cleanup; this broke the
+      installer. Instead, disable list cleanup if either of them is set to
+      false.
+  
+  [ Michael Vogt ]
+  * cmdline/apt-key:
+    - add support for a master-keyring that contains signing keys
+      that can be used to sign the archive signing keys. This should
+      make key-rollover easier.
+  * apt-pkg/deb/dpkgpm.cc:
+    - merged patch from Kees Cook to fix anoying upper-case display
+      on amd64 in sbuild
+  * apt-pkg/algorithms.cc: 
+    - add APT::Update::Post-Invoke-Success script slot
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Jan 2008 12:06:12 +0100
+
+apt (0.7.10) unstable; urgency=low
 
   [ Otavio Salvador ]
   * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
@@ -43,6 +66,15 @@ apt (0.7.10) UNRELEASED; urgency=low
   * apt-pkg/acquire-item.{cc,h}:
     - make the authentication download code more robust against
       servers/proxies with broken If-Range implementations
+  * apt-pkg/packagemanager.{cc,h}:
+    - propergate the Immediate flag to make hitting the 
+      "E: Internal Error, Could not perform immediate configuration (2)"
+      harder
+  * debian/control:
+    - build against libdb-dev (instead of libdb4.4-dev)
+  * merged the apt--DoListUpdate branch, this provides a common interface
+    for "apt-get update" like operations for the frontends and also provides
+    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
 
   [ Chris Cheney ]
   * ftparchive/contents.cc:
@@ -59,7 +91,7 @@ apt (0.7.10) UNRELEASED; urgency=low
   * Fix wording for "After unpacking...". Thans to Michael Gilbert
     for the patch. Closes: #260825
 
- -- Christian Perrier <bubulle@debian.org>  Mon, 17 Dec 2007 10:10:17 +0530
+ -- Michael Vogt <mvo@debian.org>  Mon, 07 Jan 2008 21:40:47 +0100
 
 apt (0.7.9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 742e8ca5c..2e9e306c8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
 Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/