summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-08-16 15:46:19 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-08-17 09:52:32 +0200
commit19fdf93d7363261227811a62157063081b9f1a5d (patch)
treeb3c7b4c734fcbdf11ad38785886652310b2772f2 /debian
parentd6e9ec719e2824db0b90f344f71b6e853df05627 (diff)
add the gpg-classic variant to the gpgv/gnupg or-group
We need to support partial upgrades anyhow, so we have to deal with the different versions and your tests try to ensure that we do, so we shouldn't make any explicit higher requirements.
Diffstat (limited to 'debian')
-rw-r--r--debian/control4
-rw-r--r--debian/tests/control3
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index c84e53927..c383e2fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,10 +19,10 @@ Testsuite: autopkgtest
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gpgv | gpgv2, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gpgv | gpgv2 | gpgv1, adduser
Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), bash-completion (<< 1:2.1-4.2+fakesync1), apt-utils (<< 1.3~exp2~)
Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), apt-utils (<< 1.3~exp2~)
-Recommends: gnupg | gnupg2
+Recommends: gnupg | gnupg2 | gnupg1
Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt, powermgmt-base
Description: commandline package manager
This package provides commandline tools for searching and
diff --git a/debian/tests/control b/debian/tests/control
index 406679d37..b7555dc2e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,5 @@
Tests: run-tests
Restrictions: allow-stderr
-Depends: @, @builddeps@, fakeroot, wget, stunnel4, lsof, db-util, gnupg, gnupg2,
+Depends: @, @builddeps@, fakeroot, wget, stunnel4, lsof, db-util,
+ gnupg, gnupg1, gpgv, gpgv1,
libfile-fcntllock-perl, python3-apt