[Pkg-gnupg-commit] [gpa] 01/06: allow the use of gnupg when provided by gnupg2

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpa.

commit 19f763282bd2729a1ca062a30372b6752ad670a8
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Apr 19 17:50:06 2016 -0400

    allow the use of gnupg when provided by gnupg2
    
    Note that we currently order the build-dependencies with gnupg2 first,
    so that the package can be rebuilt in unstable (gnupg version 2 is
    still only in experimental).  Eventually, we should order the
    build-deps the same way that we order the regular dependencies.
    
    See also https://bugs.debian.org/821911
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index e523ed7..07eeec2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: autopoint,
                autotools-dev (>> 20100122.1~),
                debhelper (>= 9),
                dh-autoreconf,
-               gnupg2,
+               gnupg2 | gnupg (>= 2),
                libassuan-dev (>> 2),
                libgpg-error-dev (>> 1.12),
                libgpgme11-dev (>> 1.5.0),
@@ -20,7 +20,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gnupg/gpa.git
 
 Package: gpa
 Architecture: any
-Depends: gnupg2,
+Depends: gnupg (>= 2) | gnupg2,
          gpgsm,
          libgpgme11 (>= 1.2.0-1.2~),
          ${misc:Depends},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpa.git