[Python-modules-commits] [python-gnupg] 01/02: 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 8116cc3539620713a087bf9351b687e88d6ead8e
Merge: 1a3717f e9d2681
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Sat Jul 22 18:09:11 2017 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 628a186,0000000..31e9050
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
- 8da095b2385196108f0084da3110e4bec363d4a2
- 8da095b2385196108f0084da3110e4bec363d4a2
++e9d26814c64d0bedb5021e37247d07741bb04515
++e9d26814c64d0bedb5021e37247d07741bb04515
 +c8cae436bd76deb1ca78fb573de1aa043b8a2d09
 +c8cae436bd76deb1ca78fb573de1aa043b8a2d09
 +python-gnupg_0.4.1.orig.tar.gz
 +68e8c28ccc812e8074f62700aa7a895274500644
 +44534
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index ec45f72,0000000..581836d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +skip_network_needing_test.patch
- 0002-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