manually merge Adam Conrads upload

diff --git a/debian/changelog b/debian/changelog
index 0d3573b88a05fd38a88a9c67deea072ff2e73008..b2efeae1b9ad8b28e80ab098e6df1deb8345e814 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ apt (0.8.16~exp5ubuntu5) UNRELEASED; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Aug 2011 06:48:11 +0200
 
+apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
+
+  * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
+    to a hard dependency to match Debian behaviour and fix LP: #816606
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 Aug 2011 14:48:24 -0600
+
 apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
 
   * apt-pkg/acquire.cc:

diff --git a/debian/control b/debian/control
index 4b3f886abaa3af17ad28d93037294bb2f27bda80..f78d78bd8e2e52df8633ea659a125d4853f055a1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,8 @@ Vcs-Browser: http://code.launchpad.net/apt/ubuntu
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg
+Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
 Replaces: manpages-pl (<< 20060617-3~)
-Recommends: ubuntu-keyring
 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 Description: APT's commandline package manager