[Python-modules-commits] [python-socksipy] 02/03: record new upstream branch created by importing python-socksipy_1.6.5.orig.tar.gz and merge it

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-socksipy.

commit 5e1514fe0fe50ff231e39db1e465baa460f42ac4
Merge: 43219f8 1db043b
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sat Dec 24 12:48:10 2016 +0000

    record new upstream branch created by importing python-socksipy_1.6.5.orig.tar.gz and merge it

 debian/.git-dpm | 14 +++++++-------
 setup.py        |  2 +-
 socks.py        | 11 +++++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index 05bb093,0000000..1b4608b
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
- 266439c01a8873543bd63d7b96878614b4a51e8f
- 266439c01a8873543bd63d7b96878614b4a51e8f
- 266439c01a8873543bd63d7b96878614b4a51e8f
- 266439c01a8873543bd63d7b96878614b4a51e8f
- python-socksipy_1.6.4.orig.tar.gz
- f669732f3056615274cfc7af969ebd3a6d2044c4
- 17367
++1db043b293cae3496552cde631ef5859c23c6e8a
++1db043b293cae3496552cde631ef5859c23c6e8a
++1db043b293cae3496552cde631ef5859c23c6e8a
++1db043b293cae3496552cde631ef5859c23c6e8a
++python-socksipy_1.6.5.orig.tar.gz
++293a6d6b11260a0f7deab9dbd846f1835f2e03f8
++17400
 +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/python-socksipy.git