[python-mapnik] 09/10: Drop mapnik-libdir.patch, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 26 23:34:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-mapnik.
commit 52672c0db91fe5362d1c15591be5cf52bd70966f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 27 00:14:07 2016 +0100
Drop mapnik-libdir.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/mapnik-libdir.patch | 23 -----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da803b7..d209704 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-mapnik (1:0.0~20160217-d57dce9-1) UNRELEASED; urgency=medium
* Update Vcs-Git URL to use HTTPS.
* Drop license & copyright for mapnik/__init__.py, now LGPL-2.1+ too.
* Add (build) dependencies on python{,3}-cairo.
+ * Drop mapnik-libdir.patch, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sat, 27 Feb 2016 00:01:48 +0100
diff --git a/debian/patches/mapnik-libdir.patch b/debian/patches/mapnik-libdir.patch
deleted file mode 100644
index 2731c72..0000000
--- a/debian/patches/mapnik-libdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-Applied-Upstream: https://github.com/mapnik/python-mapnik/commit/d14286e142c5ea105d0242b6cc1dc16cf75ad841
-
---- 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
deleted file mode 100644
index 3e781fb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-mapnik-libdir.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git
More information about the Pkg-grass-devel
mailing list