diff -Nru gmplot-1.1.0/debian/changelog gmplot-1.1.1/debian/changelog --- gmplot-1.1.0/debian/changelog 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/changelog 2016-10-02 17:50:59.000000000 +0000 @@ -1,3 +1,15 @@ +gmplot (1.1.1-1) unstable; urgency=medium + + [ Sandro Tosi ] + * New upstream release + * debian/control + - bump Standards-Version to 3.9.8 (no changes needed) + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + -- Sandro Tosi Sun, 02 Oct 2016 13:50:59 -0400 + gmplot (1.1.0-3) unstable; urgency=medium * debian/patches/0002-Updated-itermitems-to-items.patch diff -Nru gmplot-1.1.0/debian/control gmplot-1.1.1/debian/control --- gmplot-1.1.0/debian/control 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/control 2016-10-02 17:50:59.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Sandro Tosi Uploaders: Debian Python Modules Team Build-Depends: debhelper (>= 9), python, python3, dh-python, python-setuptools, python3-setuptools -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://github.com/vgm64/gmplot -Vcs-Git: git://anonscm.debian.org/python-modules/packages/gmplot.git +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/gmplot.git Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/gmplot.git Package: python-gmplot diff -Nru gmplot-1.1.0/debian/.git-dpm gmplot-1.1.1/debian/.git-dpm --- gmplot-1.1.0/debian/.git-dpm 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/.git-dpm 2016-10-02 17:50:59.000000000 +0000 @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -1b1248e91ce6aa71d14217c193b05bb1331a8d72 -1b1248e91ce6aa71d14217c193b05bb1331a8d72 -11bf4305066feabdbba5d16467943aed2a172572 -11bf4305066feabdbba5d16467943aed2a172572 -gmplot_1.1.0.orig.tar.gz -86702a5730dacf0d26a4ee7ebc5a0d5318954e94 -115273 +fbbb11399037daae4ccf7118a67ee12ddb5af18e +fbbb11399037daae4ccf7118a67ee12ddb5af18e +fbbb11399037daae4ccf7118a67ee12ddb5af18e +fbbb11399037daae4ccf7118a67ee12ddb5af18e +gmplot_1.1.1.orig.tar.gz +f6b91381d08f6dff53a6e4dda413afcd8e665ce6 +115240 diff -Nru gmplot-1.1.0/debian/patches/0001-use-relative-imports.patch gmplot-1.1.1/debian/patches/0001-use-relative-imports.patch --- gmplot-1.1.0/debian/patches/0001-use-relative-imports.patch 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/patches/0001-use-relative-imports.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From 5fd31ca1a4b83fa64f5f5383625fdda8be36ba54 Mon Sep 17 00:00:00 2001 -From: Sandro Tosi -Date: Sun, 31 Jan 2016 18:46:08 +0000 -Subject: use relative imports - ---- - gmplot/__init__.py | 2 +- - gmplot/gmplot.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gmplot/__init__.py b/gmplot/__init__.py -index 52216be..0acab2a 100644 ---- a/gmplot/__init__.py -+++ b/gmplot/__init__.py -@@ -1 +1 @@ --from gmplot import GoogleMapPlotter -\ No newline at end of file -+from .gmplot import GoogleMapPlotter -diff --git a/gmplot/gmplot.py b/gmplot/gmplot.py -index cb80186..a911c7d 100644 ---- a/gmplot/gmplot.py -+++ b/gmplot/gmplot.py -@@ -3,7 +3,7 @@ import requests - import json - import os - --from color_dicts import mpl_color_map, html_color_codes -+from .color_dicts import mpl_color_map, html_color_codes - - - def safe_iter(var): diff -Nru gmplot-1.1.0/debian/patches/0002-Updated-itermitems-to-items.patch gmplot-1.1.1/debian/patches/0002-Updated-itermitems-to-items.patch --- gmplot-1.1.0/debian/patches/0002-Updated-itermitems-to-items.patch 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/patches/0002-Updated-itermitems-to-items.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 1b1248e91ce6aa71d14217c193b05bb1331a8d72 Mon Sep 17 00:00:00 2001 -From: Sandro Tosi -Date: Mon, 1 Feb 2016 22:32:44 +0000 -Subject: Updated itermitems() to items() - -Iteritems() was breaking when using with Python 3+. items() in 3+ has the same -functionality as iteritems() in 2+ - -https://github.com/vgm64/gmplot/commit/50c0367cbf1e1ff3aedcf5f36a1cbcf237b820ed ---- - gmplot/gmplot.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gmplot/gmplot.py b/gmplot/gmplot.py -index a911c7d..ae601f9 100644 ---- a/gmplot/gmplot.py -+++ b/gmplot/gmplot.py -@@ -102,7 +102,7 @@ class GoogleMapPlotter(object): - settings["face_color"] - - # Need to replace "plum" with "#DDA0DD" and "c" with "#00FFFF" (cyan). -- for key, color in settings.iteritems(): -+ for key, color in settings.items(): - if 'color' in key: - color = self.color_dict.get(color, color) - color = self.html_color_codes.get(color, color) diff -Nru gmplot-1.1.0/debian/patches/series gmplot-1.1.1/debian/patches/series --- gmplot-1.1.0/debian/patches/series 2016-02-01 22:35:08.000000000 +0000 +++ gmplot-1.1.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -0001-use-relative-imports.patch -0002-Updated-itermitems-to-items.patch diff -Nru gmplot-1.1.0/gmplot/gmplot.py gmplot-1.1.1/gmplot/gmplot.py --- gmplot-1.1.0/gmplot/gmplot.py 2015-05-14 15:53:43.000000000 +0000 +++ gmplot-1.1.1/gmplot/gmplot.py 2016-09-01 19:35:38.000000000 +0000 @@ -3,7 +3,7 @@ import json import os -from color_dicts import mpl_color_map, html_color_codes +from .color_dicts import mpl_color_map, html_color_codes def safe_iter(var): @@ -45,12 +45,12 @@ def grid(self, slat, elat, latin, slng, elng, lngin): self.gridsetting = [slat, elat, latin, slng, elng, lngin] - def marker(self, lat, lng, color='#FF0000', c=None): + def marker(self, lat, lng, color='#FF0000', c=None, title="no implementation"): if c: color = c color = self.color_dict.get(color, color) color = self.html_color_codes.get(color, color) - self.points.append((lat, lng, color[1:])) + self.points.append((lat, lng, color[1:], title)) def scatter(self, lats, lngs, color=None, size=None, marker=True, c=None, s=None, **kwargs): color = color or c @@ -102,7 +102,7 @@ settings["face_color"] # Need to replace "plum" with "#DDA0DD" and "c" with "#00FFFF" (cyan). - for key, color in settings.iteritems(): + for key, color in settings.items(): if 'color' in key: color = self.color_dict.get(color, color) color = self.html_color_codes.get(color, color) @@ -232,7 +232,7 @@ def write_points(self, f): for point in self.points: - self.write_point(f, point[0], point[1], point[2]) + self.write_point(f, point[0], point[1], point[2], point[3]) def get_cycle(self, lat, lng, rad): # unit of radius: meter @@ -274,13 +274,13 @@ '\t\tvar map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);\n') f.write('\n') - def write_point(self, f, lat, lon, color): + def write_point(self, f, lat, lon, color, title): f.write('\t\tvar latlng = new google.maps.LatLng(%f, %f);\n' % (lat, lon)) f.write('\t\tvar img = new google.maps.MarkerImage(\'%s\');\n' % (self.coloricon % color)) f.write('\t\tvar marker = new google.maps.Marker({\n') - f.write('\t\ttitle: "no implimentation",\n') + f.write('\t\ttitle: "%s",\n' % title) f.write('\t\ticon: img,\n') f.write('\t\tposition: latlng\n') f.write('\t\t});\n') @@ -390,5 +390,3 @@ [-122.142048, -122.141275, -122.140503, -122.139688, -122.138872, -122.138078, -122.137241, -122.136405, -122.135568, -122.134731, -122.133894, -122.133057, -122.13222, -122.131383, -122.130557, -122.129999]) mymap.scatter(scatter_path[0], scatter_path[1], c='r', marker=True) mymap.draw('./mymap.html') - - diff -Nru gmplot-1.1.0/gmplot/__init__.py gmplot-1.1.1/gmplot/__init__.py --- gmplot-1.1.0/gmplot/__init__.py 2014-12-25 10:05:15.000000000 +0000 +++ gmplot-1.1.1/gmplot/__init__.py 2016-09-01 19:35:38.000000000 +0000 @@ -1 +1 @@ -from gmplot import GoogleMapPlotter \ No newline at end of file +from .gmplot import GoogleMapPlotter diff -Nru gmplot-1.1.0/gmplot.egg-info/PKG-INFO gmplot-1.1.1/gmplot.egg-info/PKG-INFO --- gmplot-1.1.0/gmplot.egg-info/PKG-INFO 2015-05-14 15:54:56.000000000 +0000 +++ gmplot-1.1.1/gmplot.egg-info/PKG-INFO 2016-09-01 19:36:24.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: gmplot -Version: 1.1.0 +Version: 1.1.1 Summary: Provide a matplotlib like interface to plotting data with Google Maps Home-page: https://github.com/vgm64/gmplot Author: Michael Woods diff -Nru gmplot-1.1.0/PKG-INFO gmplot-1.1.1/PKG-INFO --- gmplot-1.1.0/PKG-INFO 2015-05-14 15:54:57.000000000 +0000 +++ gmplot-1.1.1/PKG-INFO 2016-09-01 19:36:24.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: gmplot -Version: 1.1.0 +Version: 1.1.1 Summary: Provide a matplotlib like interface to plotting data with Google Maps Home-page: https://github.com/vgm64/gmplot Author: Michael Woods diff -Nru gmplot-1.1.0/setup.py gmplot-1.1.1/setup.py --- gmplot-1.1.0/setup.py 2015-05-14 15:52:30.000000000 +0000 +++ gmplot-1.1.1/setup.py 2016-09-01 19:35:52.000000000 +0000 @@ -1,7 +1,7 @@ import os from setuptools import setup, find_packages -__version__ = '1.1.0' +__version__ = '1.1.1' def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read()