summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 20:16:00 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 20:16:00 +0200
commitcd02388d4877038e13326d84c5745c44acb0ce61 (patch)
tree8a04ec28280e183a914f836d8a0b6a04e413baa7
parent15cffcd54f7638af2a2edb46330812b46fb1bf07 (diff)
remove debian-archive-keyring dependency and readd
recommends to the ubuntu-keyring
-rw-r--r--debian/changelog7
-rw-r--r--debian/control3
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d94bff7d4..1829e067c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp11ubuntu2) maverick; urgency=low
+
+ * remove debian-archive-keyring dependency and readd
+ recommends to the ubuntu-keyring
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 29 Jul 2010 20:02:39 +0200
+
apt (0.7.26~exp11ubuntu1) maverick; urgency=low
* ABI break upload
diff --git a/debian/control b/debian/control
index 535a436ee..5d709ab8e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,10 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
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