[Python-modules-commits] [python-gnupg] 03/04: merge patched into master

[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 61f6800391b636a8d5d04770f7a191a77d6c84a5
Merge: 87feb05 cafe16d
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Wed Aug 17 19:39:40 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0004-Default-on-using-gpg1-as-gpgbinary.patch  | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 gnupg.py                                           |  2 +-
 test_gnupg.py                                      |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index b669443,0000000..8f5810e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 81345def06fd47dbfbc8add1f460ddab5881e494
- 81345def06fd47dbfbc8add1f460ddab5881e494
++cafe16d56926ea0b93d74c15d5896519206c8814
++cafe16d56926ea0b93d74c15d5896519206c8814
 +16065427a552e386da63551fe79e7836133dfac5
 +16065427a552e386da63551fe79e7836133dfac5
 +python-gnupg_0.3.8.orig.tar.gz
 +b3be79566210942a2afcd87ab8f9537749df55c3
 +38993
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch
index 0000000,0000000..f6c4df9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Default-on-using-gpg1-as-gpgbinary.patch
@@@ -1,0 -1,0 +1,36 @@@
++From cafe16d56926ea0b93d74c15d5896519206c8814 Mon Sep 17 00:00:00 2001
++From: Elena Grandi <valhalla-d at trueelena.org>
++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 --cc debian/patches/series
index 46ea08c,0000000..155ccda
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +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

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