[python-mapnik] 01/02: Fix mapniklibpath in paths.py for custom path used by mapnik.

[Sebastiaan 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 8e17dd0e629d9c0cf0552b66bb9a9ab4e6197a5c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 31 16:21:24 2015 +0100

    Fix mapniklibpath in paths.py for custom path used by mapnik.
---
 debian/changelog                   |  7 +++++++
 debian/patches/mapnik-libdir.patch | 22 ++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  3 +++
 4 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9c65d75..cf65ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-mapnik (1:0.0~20151022-ab8b1f6-2) UNRELEASED; urgency=medium
+
+  * Fix mapniklibpath in paths.py for custom path used by mapnik.
+    (closes: #803564)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Oct 2015 16:20:33 +0100
+
 python-mapnik (1:0.0~20151022-ab8b1f6-1) unstable; urgency=medium
 
   * New upstream git snapshot.
diff --git a/debian/patches/mapnik-libdir.patch b/debian/patches/mapnik-libdir.patch
new file mode 100644
index 0000000..e79e2b7
--- /dev/null
+++ b/debian/patches/mapnik-libdir.patch
@@ -0,0 +1,22 @@
+Description: Support LIB_DIR_NAME environment variable for custom mapniklibpath.
+ The mapnik build supports LIB_DIR_NAME too.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/803564
+Bug: https://github.com/mapnik/python-mapnik/issues/62
+Forwarded: https://github.com/mapnik/python-mapnik/pull/64
+
+--- a/setup.py
++++ b/setup.py
+@@ -162,7 +162,11 @@ if mason_build:
+         f_paths.write(
+             'mapniklibpath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "plugins")\n')
+ elif create_paths:
+-    f_paths.write("mapniklibpath = '" + lib_path + "/mapnik'\n")
++    if os.environ.get('LIB_DIR_NAME'):
++        mapnik_lib_path = lib_path + os.environ.get('LIB_DIR_NAME')
++    else:
++        mapnik_lib_path = lib_path + "/mapnik"
++    f_paths.write("mapniklibpath = '{path}'\n".format(path=mapnik_lib_path))
+     f_paths.write('mapniklibpath = os.path.normpath(mapniklibpath)\n')
+ 
+ if create_paths:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e781fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+mapnik-libdir.patch
diff --git a/debian/rules b/debian/rules
index b64cc8a..90ad9a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ export PYBUILD_NAME=mapnik
 # Use system fonts instead of mapnik specific fonts
 export SYSTEM_FONTS=/usr/share/fonts
 
+# Custom mapnik libraries
+export LIB_DIR_NAME=/mapnik/3.0
+
 %:
 	dh $@ \
 		--with python2,python3 \

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