diff -Nru python-gnupg-0.3.8/debian/bin/gpg python-gnupg-0.3.8/debian/bin/gpg --- python-gnupg-0.3.8/debian/bin/gpg 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/bin/gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/bin/sh -GPG=`which -a gpg | uniq | tail -n+2 | head -n1` -if echo "$*" | grep -q gen-key; then - exec "$GPG" --quick-random "$@" -else - exec "$GPG" "$@" -fi diff -Nru python-gnupg-0.3.8/debian/bin/gpg1 python-gnupg-0.3.8/debian/bin/gpg1 --- python-gnupg-0.3.8/debian/bin/gpg1 1970-01-01 00:00:00.000000000 +0000 +++ python-gnupg-0.3.8/debian/bin/gpg1 2016-08-17 17:48:02.000000000 +0000 @@ -0,0 +1,7 @@ +#!/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 -Nru python-gnupg-0.3.8/debian/changelog python-gnupg-0.3.8/debian/changelog --- python-gnupg-0.3.8/debian/changelog 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/changelog 2016-08-17 17:48:02.000000000 +0000 @@ -1,3 +1,16 @@ +python-gnupg (0.3.8-3) unstable; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + [ Elena Grandi ] + * Force using gpg1 at build time + * Default on gpg1 + * Updated standard version to 3.9.8 (no changes needed) + * Add explicit build-dependency on gnupg1 (Closes: #834600) + + -- Elena Grandi Wed, 17 Aug 2016 19:48:02 +0200 + python-gnupg (0.3.8-2) unstable; urgency=medium [Andreas Noteng ] diff -Nru python-gnupg-0.3.8/debian/control python-gnupg-0.3.8/debian/control --- python-gnupg-0.3.8/debian/control 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/control 2016-08-17 17:48:02.000000000 +0000 @@ -3,17 +3,17 @@ Uploaders: Debian Python Modules Team Section: python Priority: optional -Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 9), dh-python -Standards-Version: 3.9.6 +Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 9), dh-python, gnupg1 +Standards-Version: 3.9.8 Homepage: https://bitbucket.org/vinay.sajip/python-gnupg -Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-gnupg.git +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-gnupg.git Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-gnupg.git X-Python-Version: >= 2.6 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 @@ 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 diff -Nru python-gnupg-0.3.8/debian/.git-dpm python-gnupg-0.3.8/debian/.git-dpm --- python-gnupg-0.3.8/debian/.git-dpm 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/.git-dpm 2016-08-17 17:48:02.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -fd6835d8beec6703c412c06d2cca6e8c74d8f417 -fd6835d8beec6703c412c06d2cca6e8c74d8f417 +cafe16d56926ea0b93d74c15d5896519206c8814 +cafe16d56926ea0b93d74c15d5896519206c8814 16065427a552e386da63551fe79e7836133dfac5 16065427a552e386da63551fe79e7836133dfac5 python-gnupg_0.3.8.orig.tar.gz diff -Nru python-gnupg-0.3.8/debian/patches/0002-Correctly-capture-subkey-fingerprints.patch python-gnupg-0.3.8/debian/patches/0002-Correctly-capture-subkey-fingerprints.patch --- python-gnupg-0.3.8/debian/patches/0002-Correctly-capture-subkey-fingerprints.patch 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/patches/0002-Correctly-capture-subkey-fingerprints.patch 2016-08-17 17:48:02.000000000 +0000 @@ -1,14 +1,8 @@ From fd6835d8beec6703c412c06d2cca6e8c74d8f417 Mon Sep 17 00:00:00 2001 +From: Elena Grandi +Date: Sun, 29 Nov 2015 15:03:57 +0100 Subject: Correctly capture subkey fingerprints. -Description: Subkey fingerprints are no longer incorrectly captured. -Author: Vinay Sajip -Origin: upstream -Bug: https://bitbucket.org/vinay.sajip/python-gnupg/issues/44/possible-undocumented-api-change-when -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802967 -Applied-Upstream: https://bitbucket.org/vinay.sajip/python-gnupg/commits/e3cb134162a5 -Last-Update: 2015-11-15 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + --- gnupg.py | 7 +++++-- test_gnupg.py | 3 ++- diff -Nru python-gnupg-0.3.8/debian/patches/0003-Compare-Keys-by-removing-version-and-whitespace.patch python-gnupg-0.3.8/debian/patches/0003-Compare-Keys-by-removing-version-and-whitespace.patch --- python-gnupg-0.3.8/debian/patches/0003-Compare-Keys-by-removing-version-and-whitespace.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-gnupg-0.3.8/debian/patches/0003-Compare-Keys-by-removing-version-and-whitespace.patch 2016-08-17 17:48:02.000000000 +0000 @@ -0,0 +1,35 @@ +From 81345def06fd47dbfbc8add1f460ddab5881e494 Mon Sep 17 00:00:00 2001 +From: Elena Grandi +Date: Tue, 16 Aug 2016 17:19:12 +0200 +Subject: Compare Keys by removing version and whitespace + +--- + test_gnupg.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test_gnupg.py b/test_gnupg.py +index 55a3c8e..6f6b66c 100644 +--- a/test_gnupg.py ++++ b/test_gnupg.py +@@ -8,6 +8,7 @@ import doctest + import logging + import os.path + import os ++import re + import shutil + import stat + import sys +@@ -85,10 +86,9 @@ def is_list_with_len(o, n): + + def compare_keys(k1, k2): + "Compare ASCII keys" +- k1 = k1.split('\n') +- k2 = k2.split('\n') +- del k1[1] # remove version lines +- del k2[1] ++ pattern = r'-----BEGIN PGP PUBLIC KEY BLOCK-----\n.*\s+' ++ k1 = re.sub(pattern, '', k1) ++ k2 = re.sub(pattern, '', k2) + return k1 != k2 + + class GPGTestCase(unittest.TestCase): diff -Nru python-gnupg-0.3.8/debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch python-gnupg-0.3.8/debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch --- python-gnupg-0.3.8/debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-gnupg-0.3.8/debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch 2016-08-17 17:48:02.000000000 +0000 @@ -0,0 +1,36 @@ +From cafe16d56926ea0b93d74c15d5896519206c8814 Mon Sep 17 00:00:00 2001 +From: Elena Grandi +Date: Wed, 17 Aug 2016 19:39:21 +0200 +Subject: Default on using gpg1 as gpgbinary + +--- + gnupg.py | 2 +- + test_gnupg.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnupg.py b/gnupg.py +index 01f86ff..ed7cc0d 100644 +--- a/gnupg.py ++++ b/gnupg.py +@@ -692,7 +692,7 @@ class GPG(object): + } + + "Encapsulate access to the gpg executable" +- def __init__(self, gpgbinary='gpg', gnupghome=None, verbose=False, ++ def __init__(self, gpgbinary='gpg1', gnupghome=None, verbose=False, + use_agent=False, keyring=None, options=None, + secret_keyring=None): + """Initialize a GPG process wrapper. Options are: +diff --git a/test_gnupg.py b/test_gnupg.py +index 6f6b66c..0adaab2 100644 +--- a/test_gnupg.py ++++ b/test_gnupg.py +@@ -24,7 +24,7 @@ ALL_TESTS = True + + logger = logging.getLogger(__name__) + +-GPGBINARY = os.environ.get('GPGBINARY', 'gpg') ++GPGBINARY = os.environ.get('GPGBINARY', 'gpg1') + + KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1.4.9 (MingW32) diff -Nru python-gnupg-0.3.8/debian/patches/series python-gnupg-0.3.8/debian/patches/series --- python-gnupg-0.3.8/debian/patches/series 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/patches/series 2016-08-17 17:48:02.000000000 +0000 @@ -1,2 +1,4 @@ skip_network_needing_test.patch 0002-Correctly-capture-subkey-fingerprints.patch +0003-Compare-Keys-by-removing-version-and-whitespace.patch +0004-Default-on-using-gpg1-as-gpgbinary.patch diff -Nru python-gnupg-0.3.8/debian/rules python-gnupg-0.3.8/debian/rules --- python-gnupg-0.3.8/debian/rules 2015-11-29 14:19:10.000000000 +0000 +++ python-gnupg-0.3.8/debian/rules 2016-08-17 17:48:02.000000000 +0000 @@ -9,7 +9,7 @@ override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - chmod 755 $(CURDIR)/debian/bin/gpg + chmod 755 $(CURDIR)/debian/bin/gpg1 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