From: Julian Andres Klode <jak@debian.org>
Date: Thu, 18 Aug 2016 12:21:16 +0000 (+0200)
Subject: tests/control: Handle the gpg1/gpg2 mess a bit better
X-Git-Tag: 1.3_rc3~34
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6fbe5739701f4c63bcd5c68d9ecc19e9e28288de

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 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