Merge lp:~lifeless/ubuntu/oneiric/apt/bug-816606 into lp:ubuntu/oneiric/apt

[Robert Collins]

Fix debootstrap / ensemble bootstrap / lxc bootstrapping of oneiric.

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-13 14:42:02 +0000
+++ debian/changelog	2011-08-03 04:53:26 +0000
@@ -1,3 +1,10 @@
+apt (0.8.15.1ubuntu3) natty; urgency=low
+
+  * Depend rather than recommending ubuntu-keyring, so that postinst can
+    reliably work. (Debian depend rather than recommending). (LP: #816606)
+
+ -- Robert Collins <[e-mail]>  Wed, 03 Aug 2011 16:33:39 +1200
+
 apt (0.8.15.1ubuntu2) oneiric; urgency=low
 
   [ Brian Murray ]
 
=== modified file 'debian/control'
--- debian/control	2011-06-29 09:03:39 +0000
+++ debian/control	2011-08-03 04:53:26 +0000
@@ -14,10 +14,10 @@
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg,
+ ubuntu-keyring
 Replaces: manpages-pl (<< 20060617-3~)
 Provides: ${libapt-pkg:provides}
-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