This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik.
commit 9061f3318c0c625a07809258dcf2d9d1257ba01a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 24 14:36:24 2015 +0200 Drop system-fonts.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/system-fonts.patch | 23 ----------------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9389e51..d718b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-mapnik (1:0.0~20151022-ab8b1f6-1) UNRELEASED; urgency=medium * New upstream git snapshot. + * Drop system-fonts.patch, applied upstream. -- Bas Couwenberg <sebas...@debian.org> Sat, 24 Oct 2015 14:28:34 +0200 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ad9dfc6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -system-fonts.patch diff --git a/debian/patches/system-fonts.patch b/debian/patches/system-fonts.patch deleted file mode 100644 index bf8d6bf..0000000 --- a/debian/patches/system-fonts.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Add support for system fonts to setup.py. - The same is supported in build.py if no mapnik/paths.py exists. -Author: Bas Couwenberg <sebas...@debian.org> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799473#10 -Forwarded: https://github.com/mapnik/python-mapnik/pull/59 -Applied-Upstream: https://github.com/mapnik/python-mapnik/commit/8fd2e85f9add634d162a5c0a2c16ac43e9d1aa02 - ---- a/setup.py -+++ b/setup.py -@@ -167,8 +167,12 @@ elif create_paths: - - if create_paths: - f_paths.write("inputpluginspath = os.path.join(mapniklibpath,'input')\n") -+ if os.environ.get('SYSTEM_FONTS'): -+ font_path = "os.path.normpath('%s')" % os.environ.get('SYSTEM_FONTS') -+ else: -+ font_path = "os.path.join(mapniklibpath,'fonts')" - f_paths.write( -- "fontscollectionpath = os.path.join(mapniklibpath,'fonts')\n") -+ "fontscollectionpath = " + font_path + "\n") - f_paths.write( - "__all__ = [mapniklibpath,inputpluginspath,fontscollectionpath]\n") - f_paths.close() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel