[Python-modules-commits] [gmplot] 02/04: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository gmplot.

commit 0e0ee6e53e62b1a2893d8ab8ebfbf8d748053f72
Merge: 65fb113 5fd31ca
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 31 18:46:11 2016 +0000

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0001-use-relative-imports.patch | 31 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 gmplot/__init__.py                             |  2 +-
 gmplot/gmplot.py                               |  2 +-
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index d0a6fb6,0000000..67ca3f3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 11bf4305066feabdbba5d16467943aed2a172572
- 11bf4305066feabdbba5d16467943aed2a172572
++5fd31ca1a4b83fa64f5f5383625fdda8be36ba54
++5fd31ca1a4b83fa64f5f5383625fdda8be36ba54
 +11bf4305066feabdbba5d16467943aed2a172572
 +11bf4305066feabdbba5d16467943aed2a172572
 +gmplot_1.1.0.orig.tar.gz
 +86702a5730dacf0d26a4ee7ebc5a0d5318954e94
 +115273
diff --cc debian/patches/0001-use-relative-imports.patch
index 0000000,0000000..90151bc
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-use-relative-imports.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 5fd31ca1a4b83fa64f5f5383625fdda8be36ba54 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++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 --cc debian/patches/series
index 0000000,0000000..d2ab32d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-use-relative-imports.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gmplot.git