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.

diff --git a/debian/tests/control b/debian/tests/control
index b7555dc2eee99e1c4ff9b606a81d1343996c529d..a282584fa2a8c68a51ef370d7dd4688f262fea65 100644 (file)
--- 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,
 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
          libfile-fcntllock-perl, python3-apt