[python-pyproj] 05/10: Drop 02-use_setup-proj.patch, no longer required.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-pyproj.

commit 0448a9f2399263a7391265049344892ef626cf55
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 6 22:09:05 2016 +0100

    Drop 02-use_setup-proj.patch, no longer required.
    
    setup.py now supports system proj directly.
---
 debian/changelog                       |  2 +
 debian/patches/02-use_setup-proj.patch | 76 ----------------------------------
 debian/patches/series                  |  1 -
 3 files changed, 2 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11b7253..b6703fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-pyproj (1.9.5-1) UNRELEASED; urgency=medium
     - Update copyright years for Charles Karney
     - Add Even Rouault & Andrey Kiselev to copyright holders
     - Add license & copyright for src/PJ_sch.c
+  * Drop 02-use_setup-proj.patch, no longer required.
+    setup.py now supports system proj directly.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Jan 2016 21:38:44 +0100
 
diff --git a/debian/patches/02-use_setup-proj.patch b/debian/patches/02-use_setup-proj.patch
deleted file mode 100644
index 6d360e2..0000000
--- a/debian/patches/02-use_setup-proj.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: Use setup-proj.py for system installed Proj.4.
- Don't overwrite datadir.py with setup.py, but use quilt patch.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
---- a/setup.py
-+++ b/setup.py
-@@ -1,36 +1,36 @@
--import sys, os, glob, subprocess
--from distutils import ccompiler, sysconfig
-+# build pyproj using installed proj library and data files
-+# (instead of bundled source and data)
- from distutils.core import setup, Extension
-+import os, glob, numpy, sys, subprocess
- 
--deps = glob.glob('src/*.c')
--extensions = [Extension("pyproj._proj",deps+['_proj.c'],include_dirs = ['src'])]
-+proj_dir = os.environ.get('PROJ_DIR')
-+if proj_dir is None: proj_dir='/usr/local'
-+proj_libdir = os.environ.get('PROJ_LIBDIR')
-+proj_incdir = os.environ.get('PROJ_INCDIR')
-+libdirs=[]
-+incdirs=[numpy.get_include()]
-+libraries=['proj']
- 
--# create binary datum shift grid files.
--pathout = os.path.join('lib',os.path.join('pyproj','data'))
--if sys.argv[1] != 'sdist':
--    cc = ccompiler.new_compiler()
--    sysconfig.get_config_vars()
--    sysconfig.customize_compiler(cc)
--    cc.set_include_dirs(['src'])
--    objects = cc.compile(['nad2bin.c', 'src/pj_malloc.c'])
--    execname = 'nad2bin'
--    cc.link_executable(objects, execname)
--    llafiles = glob.glob('datumgrid/*.lla')
--    cmd = os.path.join(os.getcwd(),execname)
--    for f in llafiles:
--        fout = os.path.basename(f.split('.lla')[0])
--        fout = os.path.join(pathout,fout)
--        strg = '%s %s < %s' % (cmd, fout, f)
--        sys.stdout.write('executing %s'%strg)
--        subprocess.call(strg,shell=True)
-+if proj_libdir is None and proj_dir is not None:
-+    libdirs.append(os.path.join(proj_dir,'lib'))
-+    libdirs.append(os.path.join(proj_dir,'lib64'))
-+if proj_incdir is None and proj_dir is not None:
-+    incdirs.append(os.path.join(proj_dir,'include'))
-+
-+pyprojext =\
-+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'}
- 
--datafiles = glob.glob(os.path.join(pathout,'*'))
--datafiles = [os.path.join('data',os.path.basename(f)) for f in datafiles]
--package_data = {'pyproj':datafiles}
--
- setup(name = "pyproj",
-   version = "1.9.4",
-   description = "Python interface to PROJ.4 library",
-@@ -56,6 +56,5 @@ Optimized for numpy arrays.""",
-                        "Operating System :: OS Independent"],
-   packages          = packages,
-   package_dir       = package_dirs,
--  ext_modules = extensions,
--  package_data = package_data
-+  ext_modules = [pyprojext]
-   )
diff --git a/debian/patches/series b/debian/patches/series
index ff139e5..5b24c50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-use_proj-data_instead_of_embedded.patch
-02-use_setup-proj.patch

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