[python-mapnik] 04/05: Drop pr123-install-mapnik-printing.patch, included upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-mapnik.

commit 376d8a113a51a53e01c2e9a728847f11a224c975
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 6 19:42:10 2017 +0100

    Drop pr123-install-mapnik-printing.patch, included upstream.
---
 debian/changelog                                   |  1 +
 debian/patches/pr123-install-mapnik-printing.patch | 36 ----------------------
 debian/patches/series                              |  1 -
 debian/patches/skip-tests-for-missing-data.patch   |  4 +--
 4 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bcc401..fa31d62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-mapnik (1:0.0~20170120-8139e5c-1) UNRELEASED; urgency=medium
 
   * New upstream git snapshot.
+  * Drop pr123-install-mapnik-printing.patch, included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 06 Feb 2017 19:41:00 +0100
 
diff --git a/debian/patches/pr123-install-mapnik-printing.patch b/debian/patches/pr123-install-mapnik-printing.patch
deleted file mode 100644
index f72542a..0000000
--- a/debian/patches/pr123-install-mapnik-printing.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix printing module.
- Currently the printing module isn't being installed by setup.py
-Author: Asbjørn Sloth Tønnesen <asbjorn at asbjorn.st>
-Origin: https://github.com/mapnik/python-mapnik/pull/123
-
---- a/setup.py
-+++ b/setup.py
-@@ -256,7 +256,7 @@ if os.environ.get("CXX", False) == False
- setup(
-     name="mapnik",
-     version="0.1",
--    packages=['mapnik'],
-+    packages=['mapnik','mapnik.printing'],
-     author="Blake Thompson",
-     author_email="flippmoke at gmail.com",
-     description="Python bindings for Mapnik",
---- a/mapnik/printing/__init__.py
-+++ b/mapnik/printing/__init__.py
-@@ -65,6 +65,7 @@ class PDFPrinter(object):
-     Main class for creating PDF print outs. Basic usage is along the lines of
- 
-     import mapnik
-+    import mapnik.printing
- 
-     page = mapnik.printing.PDFPrinter()
-     m = mapnik.Map(100,100)
---- a/test/python_tests/pdf_printing_test.py
-+++ b/test/python_tests/pdf_printing_test.py
-@@ -6,6 +6,7 @@ from nose.tools import eq_
- from nose.plugins.skip import SkipTest
- 
- import mapnik
-+import mapnik.printing
- from .utilities import execution_path, run_all
- 
- def setup():
diff --git a/debian/patches/series b/debian/patches/series
index 73018c5..691a82a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 skip-tests-for-missing-data.patch
-pr123-install-mapnik-printing.patch
diff --git a/debian/patches/skip-tests-for-missing-data.patch b/debian/patches/skip-tests-for-missing-data.patch
index edb6a64..59addcd 100644
--- a/debian/patches/skip-tests-for-missing-data.patch
+++ b/debian/patches/skip-tests-for-missing-data.patch
@@ -1496,9 +1496,9 @@ Forwarded: https://github.com/mapnik/python-mapnik/pull/107
  
  import mapnik
  from .utilities import execution_path, run_all
-@@ -32,6 +33,9 @@ def make_pdf(m, output_pdf, esri_wkt):
+@@ -34,6 +35,9 @@ if mapnik.has_pycairo():
+ 	import mapnik.printing
  
- if mapnik.has_pycairo():
  	def test_pdf_printing():
 +                if not os.path.exists('../data/good_maps/marker-text-line.xml'):
 +                    raise SkipTest

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git