diff options
| -rw-r--r-- | apt-pkg/contrib/gpgv.cc | 4 | ||||
| -rw-r--r-- | debian/tests/control | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 565fb7de5..7b0a0d240 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -255,12 +255,8 @@ std::pair<std::string, std::forward_list<std::string>> APT::Internal::FindGPGV(b // Prefer absolute path "/usr/bin/gpgv-sq", "/usr/bin/gpgv", - "/usr/bin/gpgv2", - "/usr/bin/gpgv1", "gpgv-sq", "gpgv", - "gpgv2", - "gpgv1", }; for (auto gpgv : gpgvVariants) if (CheckGPGV(checkedCommands, gpgv, Debug)) diff --git a/debian/tests/control b/debian/tests/control index 3aef98710..428bed456 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -5,8 +5,7 @@ Depends: libapt-pkg-dev, pkg-config, g++ Tests: run-tests Restrictions: allow-stderr Depends: @, @builddeps@, dpkg (>= 1.20.8), expect, fakeroot, wget, stunnel4, lsof, db-util, - gnupg (>= 2) | gnupg2, gnupg1 | gnupg (<< 2), - gpgv (>= 2) | gpgv2, gpgv1 | gpgv (<< 2), + gpgv, gpgv-sq, sq (>= 0.40), moreutils, |