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

[Ondrej Koblizek]

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

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

commit 7683d2587d0a325ef82aab0247891d1f24d4fb43
Merge: 9efe749 abedbf6
Author: Ondřej Kobližek <ondrej.koblizek at firma.seznam.cz>
Date:   Thu Nov 2 08:24:11 2017 +0100

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

 HISTORY.rst          |  8 ++++++++
 PKG-INFO             |  2 +-
 debian/.git-dpm      | 14 +++++++-------
 geoip2/__init__.py   |  2 +-
 geoip2/records.py    | 53 +++++++++++++++++++++++++++++++++++++++++++++++-----
 setup.cfg            |  1 +
 tests/models_test.py | 17 +++++++++++++++--
 7 files changed, 81 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 26a4901,0000000..25ba4a6
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
- cba45d4629a691e35e69c98cb250547808ea6efb
- cba45d4629a691e35e69c98cb250547808ea6efb
- cba45d4629a691e35e69c98cb250547808ea6efb
- cba45d4629a691e35e69c98cb250547808ea6efb
- python-geoip2_2.5.0+dfsg1.orig.tar.gz
- a4862032a3cddebe2135662044f532e80e31547d
- 112775
++abedbf6e35fecad5ab1deaed7417ecb8863063bc
++abedbf6e35fecad5ab1deaed7417ecb8863063bc
++abedbf6e35fecad5ab1deaed7417ecb8863063bc
++abedbf6e35fecad5ab1deaed7417ecb8863063bc
++python-geoip2_2.6.0+dfsg1.orig.tar.gz
++53b32d39cd93977e1b4687f0981fd94a105cb818
++105897
 +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