[Python-modules-commits] [python-geoip2] 02/04: record new upstream branch created by importing python-geoip2_2.4.2+dfsg1.orig.tar.gz and merge it

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-geoip2.

commit 3a751c23fa5bec8ae588ea7da95ebc9dd40eda04
Merge: b537cf7 7318465
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Dec 11 15:46:39 2016 +0100

    record new upstream branch created by importing python-geoip2_2.4.2+dfsg1.orig.tar.gz and merge it

 HISTORY.rst          |  9 +++++++++
 PKG-INFO             |  2 +-
 debian/.git-dpm      | 14 +++++++-------
 geoip2/__init__.py   |  2 +-
 geoip2/webservice.py | 10 +++++++---
 setup.py             |  2 +-
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 159fd5f,0000000..24d2682
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
- 8c14f9628ee91d35aaaf19a7b4d34127f5ffde38
- 8c14f9628ee91d35aaaf19a7b4d34127f5ffde38
- 8c14f9628ee91d35aaaf19a7b4d34127f5ffde38
- 8c14f9628ee91d35aaaf19a7b4d34127f5ffde38
- python-geoip2_2.4.1+dfsg1.orig.tar.gz
- 0da92b3b7a6042747979bf19447db051e291bd05
- 156623
++7318465bc7198883f7ad048f0a08d56e439f316e
++7318465bc7198883f7ad048f0a08d56e439f316e
++7318465bc7198883f7ad048f0a08d56e439f316e
++7318465bc7198883f7ad048f0a08d56e439f316e
++python-geoip2_2.4.2+dfsg1.orig.tar.gz
++7a552c3bc70cff423bf673d875b13ba517fd0329
++157295
 +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-geoip2.git