[Python-modules-commits] [python-gnupg] 01/03: Explicitely use gnupg1 at build time and as a dependency.

[Elena Grandi]

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

valhalla-guest pushed a commit to branch master
in repository python-gnupg.

commit 3a2f6b0515ab6385fc7c9fbf6f169774de56dfad
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Tue Aug 16 15:28:07 2016 +0200

    Explicitely use gnupg1 at build time and as a dependency.
---
 debian/bin/gpg   | 2 +-
 debian/changelog | 6 +++++-
 debian/control   | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/bin/gpg b/debian/bin/gpg
index 2d94d8f..54a92fd 100755
--- a/debian/bin/gpg
+++ b/debian/bin/gpg
@@ -1,5 +1,5 @@
 #!/bin/sh
-GPG=`which -a gpg | uniq | tail -n+2 | head -n1`
+GPG=`which -a gpg1 | uniq | head -n1`
 if echo "$*" | grep -q gen-key; then
     exec "$GPG" --quick-random "$@"
 else
diff --git a/debian/changelog b/debian/changelog
index f66bbea..4c1111b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 python-gnupg (0.3.8-3) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:07:36 +0200
+  [ Elena Grandi ]
+  * Force using gpg1 at build time
+
+ -- Elena Grandi <valhalla-d at trueelena.org>  Tue, 16 Aug 2016 17:11:52 +0200
 
 python-gnupg (0.3.8-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 21fa90d..c4aeb23 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Elena Grandi <valhalla-d at trueelena.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Section: python
 Priority: optional
-Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 9), dh-python
+Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 9), dh-python, gnupg1
 Standards-Version: 3.9.6
 Homepage: https://bitbucket.org/vinay.sajip/python-gnupg
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-gnupg.git
@@ -13,7 +13,7 @@ X-Python3-Version: >= 3.2
 
 Package: python-gnupg
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, gnupg
+Depends: ${misc:Depends}, ${python:Depends}, gnupg1
 Description: Python wrapper for the GNU Privacy Guard (Python 2.x)
  Python-GnuPG allows easy and well-documented access to basic GnuPG
  functionality such as generating and managing keys, encrypting and
@@ -23,7 +23,7 @@ Description: Python wrapper for the GNU Privacy Guard (Python 2.x)
 
 Package: python3-gnupg
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, gnupg
+Depends: ${misc:Depends}, ${python3:Depends}, gnupg1
 Description: Python wrapper for the GNU Privacy Guard (Python 3.x)
  Python-GnuPG allows easy and well-documented access to basic GnuPG
  functionality such as generating and managing keys, encrypting and

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gnupg.git