[Python-modules-commits] [python-gnupg] 02/02: Switch back to gpg itself (away from gpg1)

[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 58068e2ca2d36215e86ae3522ff8596963ac7fef
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Feb 17 17:23:09 2017 -0500

    Switch back to gpg itself (away from gpg1)
    
    The "modern" GnuPG suite (2.1.x) has the most developer and maintainer
    support. Debian should not rely on the "classic" suite (1.4.x, aka
    gnupg1) where we can avoid it.  With the preceding patch series, we
    can avoid all dependencies on gnupg1.  This patch adjusts the debian
    packaging accordingly.
---
 debian/bin/gpg  | 7 +++++++
 debian/bin/gpg1 | 7 -------
 debian/control  | 6 +++---
 debian/rules    | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/bin/gpg b/debian/bin/gpg
new file mode 100644
index 0000000..8c3206d
--- /dev/null
+++ b/debian/bin/gpg
@@ -0,0 +1,7 @@
+#!/bin/sh
+GPG=`which -a gpg | uniq | tail -n+2 | head -n1`
+if echo "$*" | grep -q gen-key; then
+    exec "$GPG" --debug-quick-random "$@"
+else
+    exec "$GPG" "$@"
+fi
diff --git a/debian/bin/gpg1 b/debian/bin/gpg1
deleted file mode 100755
index 9a41f14..0000000
--- a/debian/bin/gpg1
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-GPG=`which -a gpg1 | uniq | tail -n+2 | head -n1`
-if echo "$*" | grep -q gen-key; then
-    exec "$GPG" --quick-random "$@"
-else
-    exec "$GPG" "$@"
-fi
diff --git a/debian/control b/debian/control
index 055f263..3669a30 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, gnupg1
+Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 9), dh-python, gnupg
 Standards-Version: 3.9.8
 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}, gnupg1
+Depends: ${misc:Depends}, ${python:Depends}, gnupg
 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}, gnupg1
+Depends: ${misc:Depends}, ${python3:Depends}, gnupg
 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
diff --git a/debian/rules b/debian/rules
index d484d82..51d77f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export PYBUILD_NAME=gnupg
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	chmod 755 $(CURDIR)/debian/bin/gpg1
+	chmod 755 $(CURDIR)/debian/bin/gpg
 	set -ex; for py in $(shell pyversions -r -v); do \
 		PATH=$(CURDIR)/debian/bin:$$PATH PYTHONPATH=$(CURDIR)/build/lib.*-$$py python$$py test_gnupg.py ;\
 	done

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