diff options
author | Julian Andres Klode <jak@debian.org> | 2016-08-18 14:21:16 +0200 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2016-08-19 16:50:23 +0200 |
commit | 6fbe5739701f4c63bcd5c68d9ecc19e9e28288de (patch) | |
tree | 3589a41c60b5b9c162aed0830b475f9e9a4ed843 /debian | |
parent | ecb8e9d77faf1940c0defb78f0078f66562373b7 (diff) |
tests/control: Handle the gpg1/gpg2 mess a bit better
Hardcoding gpgv1 and gnupg1 breaks Ubuntu, because on Ubuntu,
these packages do not exist yet. Instead allow gnupg (<< 2)
for gnupg1 and gnupg2 for gnupg (>= 2), so we cover all
potential combinations.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/tests/control | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index b7555dc2e..a282584fa 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,8 @@ Tests: run-tests Restrictions: allow-stderr Depends: @, @builddeps@, fakeroot, wget, stunnel4, lsof, db-util, - gnupg, gnupg1, gpgv, gpgv1, + gnupg (>= 2) | gnupg2, + gnupg1 | gnupg (<< 2), + gpgv (>= 2) | gpgv2, + gpgv1 | gpgv (<< 2), libfile-fcntllock-perl, python3-apt |