This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-pyproj.
commit 5e062b79f424d601cac55007f73cee0b5db66bc5 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Apr 6 15:10:33 2014 +0200 Update patches for new upstream release. --- .../01-use_proj-data_instead_of_embedded.patch | 23 ++++++++-------------- debian/patches/02-dont_compile_datums.patch | 12 ++++------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/debian/patches/01-use_proj-data_instead_of_embedded.patch b/debian/patches/01-use_proj-data_instead_of_embedded.patch index bcd3baa..ace052d 100644 --- a/debian/patches/01-use_proj-data_instead_of_embedded.patch +++ b/debian/patches/01-use_proj-data_instead_of_embedded.patch @@ -2,18 +2,11 @@ From: David Paleino <da...@debian.org> Subject: use official data instead of embedded copy Forwarded: not-needed ---- - lib/pyproj/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- python-pyproj.orig/lib/pyproj/__init__.py -+++ python-pyproj/lib/pyproj/__init__.py -@@ -56,7 +56,7 @@ from array import array - import os - #import numpy as np - --pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+pyproj_datadir = "/usr/share/proj/" - if not os.path.isdir(pyproj_datadir): - msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir - raise IOError(msg) +--- a/lib/pyproj/datadir.py ++++ b/lib/pyproj/datadir.py +@@ -3,4 +3,4 @@ import os + if 'PROJ_DIR' in os.environ: + pyproj_datadir = os.environ['PROJ_DIR'] + else: +- pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data']) ++ pyproj_datadir = "/usr/share/proj/" diff --git a/debian/patches/02-dont_compile_datums.patch b/debian/patches/02-dont_compile_datums.patch index 18ecd7f..f1fc002 100644 --- a/debian/patches/02-dont_compile_datums.patch +++ b/debian/patches/02-dont_compile_datums.patch @@ -4,18 +4,14 @@ Subject: don't compile datum files, as we're using the ones provided by Origin: vendor Forwarded: not-needed ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- python-pyproj.orig/setup.py -+++ python-pyproj/setup.py -@@ -8,7 +8,7 @@ extensions.append(Extension("pyproj._geo +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ extensions = [Extension("pyproj._proj",d # create binary datum shift grid files. pathout = os.path.join('lib',os.path.join('pyproj','data')) -if sys.argv[1] != 'sdist': +if False: cc = ccompiler.new_compiler() - sysconfig.customize_compiler(cc) + #sysconfig.customize_compiler(cc) # doesn't work in python 3.3 cc.set_include_dirs(['src']) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pyproj.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