This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-pyproj.
commit d4c25ff911788fff86898a202741565ffc2b36c4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Mar 1 03:33:56 2015 +0100
Refresh patches for new upstream release.
---
debian/patches/02-use_setup-proj.patch | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/debian/patches/02-use_setup-proj.patch
b/debian/patches/02-use_setup-proj.patch
index 2c88d99..6d360e2 100644
--- a/debian/patches/02-use_setup-proj.patch
+++ b/debian/patches/02-use_setup-proj.patch
@@ -3,7 +3,7 @@ Description: Use setup-proj.py for system installed Proj.4.
Author: Bas Couwenberg <sebas...@xs4all.nl>
--- a/setup.py
+++ b/setup.py
-@@ -1,35 +1,28 @@
+@@ -1,36 +1,36 @@
-import sys, os, glob, subprocess
-from distutils import ccompiler, sysconfig
+# build pyproj using installed proj library and data files
@@ -25,7 +25,8 @@ Author: Bas Couwenberg <sebas...@xs4all.nl>
-pathout = os.path.join('lib',os.path.join('pyproj','data'))
-if sys.argv[1] != 'sdist':
- cc = ccompiler.new_compiler()
-- #sysconfig.customize_compiler(cc) # doesn't work in python 3.3
+- sysconfig.get_config_vars()
+- sysconfig.customize_compiler(cc)
- cc.set_include_dirs(['src'])
- objects = cc.compile(['nad2bin.c', 'src/pj_malloc.c'])
- execname = 'nad2bin'
@@ -45,7 +46,15 @@ Author: Bas Couwenberg <sebas...@xs4all.nl>
+ incdirs.append(os.path.join(proj_dir,'include'))
+
+pyprojext =\
-+Extension("pyproj._proj",["_proj.c"],include_dirs=incdirs,library_dirs=libdirs,libraries=libraries)
++Extension("pyproj._proj",["_proj.c"],include_dirs=incdirs,library_dirs=libdirs,\
++runtime_library_dirs=libdirs,libraries=libraries)
++
++# over-write default data directory.
++#pyproj_datadir = os.path.join(os.path.join(proj_dir,'share'),'proj')
++#datadirfile = os.path.join('lib',os.path.join('pyproj','datadir.py'))
++#f = open(datadirfile,'w')
++#f.write('pyproj_datadir="%s"\n' % pyproj_datadir)
++#f.close()
packages = ['pyproj']
package_dirs = {'':'lib'}
@@ -55,19 +64,9 @@ Author: Bas Couwenberg <sebas...@xs4all.nl>
-package_data = {'pyproj':datafiles}
-
setup(name = "pyproj",
- version = "1.9.3",
+ version = "1.9.4",
description = "Python interface to PROJ.4 library",
-@@ -47,14 +40,13 @@ Optimized for numpy arrays.""",
- license = "OSI Approved",
- keywords = ["python","map projections","GIS","mapping","maps"],
- classifiers = ["Development Status :: 4 - Beta",
-- "Intended Audience :: Science/Research",
-- "License :: OSI Approved",
-+ "Intended Audience :: Science/Research",
-+ "License :: OSI Approved",
- "Topic :: Software Development :: Libraries :: Python
Modules",
- "Topic :: Scientific/Engineering :: GIS",
- "Topic :: Scientific/Engineering :: Mathematics",
+@@ -56,6 +56,5 @@ Optimized for numpy arrays.""",
"Operating System :: OS Independent"],
packages = packages,
package_dir = package_dirs,
--
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
