From 7f6464872762464d0989166e4431b1e87de5fb82 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Aug 2011 06:53:15 +0200 Subject: manually merge Adam Conrads upload --- debian/changelog | 7 +++++++ debian/control | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d3573b88..b2efeae1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,13 @@ apt (0.8.16~exp5ubuntu5) UNRELEASED; urgency=low -- Michael Vogt 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 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 4b3f886ab..f78d78bd8 100644 --- 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 -- cgit v1.2.3