[Python-modules-commits] [websocket-client] 01/09: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository websocket-client.

commit 78e19ff515ad607052759840dfdcad14f0c14db6
Merge: 7c19693 d032cec
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Jul 12 09:46:16 2016 +0200

    merge patched into master

 debian/.git-dpm                   |  4 ++--
 debian/patches/no-ship-tests.diff | 31 -------------------------------
 debian/patches/series             |  1 -
 setup.py                          |  3 ++-
 4 files changed, 4 insertions(+), 35 deletions(-)

diff --cc debian/.git-dpm
index 6ad0583,0000000..75b2fe6
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
- 44d8bd176284a1754918280add367ebe09c9dd0d
- 44d8bd176284a1754918280add367ebe09c9dd0d
++d032cec51de729c7cb86b710170b1283c0463146
++d032cec51de729c7cb86b710170b1283c0463146
 +d032cec51de729c7cb86b710170b1283c0463146
 +d032cec51de729c7cb86b710170b1283c0463146
 +websocket-client_0.18.0.orig.tar.gz
 +88343c86912bb88541d4ebf78f71c0f1b24dde0e
 +192122
 +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/websocket-client.git