[Python-modules-commits] [pyjwt] 01/05: merge patched into master

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository pyjwt.

commit fec008e5a7bbad7987b756fe8ab0f0c15b508713
Merge: 0580dfe 339a054
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Wed Jul 20 15:11:08 2016 +0200

    merge patched into master

 debian/.git-dpm                                  |  6 +++---
 debian/patches/01_do-not-use-pytest-runner.patch | 27 ------------------------
 debian/patches/series                            |  1 -
 setup.py                                         |  2 +-
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index 4938c71,0000000..51a6c07
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
- 34ae12edc2217dba795c7b490981e9d2890986c9
- 34ae12edc2217dba795c7b490981e9d2890986c9
- ec312a6d35e8e84d86a92e70e47beccf34817952
++339a054cf7293a7d9ba8b8eac5558f1d92490a0a
++339a054cf7293a7d9ba8b8eac5558f1d92490a0a
++339a054cf7293a7d9ba8b8eac5558f1d92490a0a
 +339a054cf7293a7d9ba8b8eac5558f1d92490a0a
 +pyjwt_1.4.0.orig.tar.gz
 +5e8e0d23ccc626b3a37e0bc73799f2d1ad2826a4
 +34613
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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