summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-10 06:53:15 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-10 06:53:15 +0200
commit7f6464872762464d0989166e4431b1e87de5fb82 (patch)
tree2833fc5b7f295c60e6f5cc968d1085914093759a /debian
parent8978749b39b084ae0121c63619837b83838eaf3b (diff)
manually merge Adam Conrads upload
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control3
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 <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 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