[DebianGIS-dev] [SCM] python-pyproj branch, master, updated. debian/1.8.7-1-6-gcb18f92

[David Paleino]

The following commit has been merged in the master branch:
commit 96df262f1caa781a533ff8feab247f8e9bad381b
Author: David Paleino <dapal at debian.org>
Date:   Thu Sep 16 11:24:57 2010 +0200

    debian/patches/02-dont_compile_datums.patch added: don't compile datum files, since we're using the ones provided by proj-data

diff --git a/debian/changelog b/debian/changelog
index bdd1f1f..9d28c69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ python-pyproj (1.8.8-1) UNRELEASED; urgency=low
   * New upstream version
   * debian/watch: don't use the redirector anymore, since I'm going
     to shut it down
+  * debian/patches/02-dont_compile_datums.patch added: don't compile
+    datum files, since we're using the ones provided by proj-data
 
- -- David Paleino <dapal at debian.org>  Thu, 16 Sep 2010 10:24:24 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 16 Sep 2010 11:24:34 +0200
 
 python-pyproj (1.8.7-1) unstable; urgency=low
 
diff --git a/debian/patches/02-dont_compile_datums.patch b/debian/patches/02-dont_compile_datums.patch
new file mode 100644
index 0000000..d924990
--- /dev/null
+++ b/debian/patches/02-dont_compile_datums.patch
@@ -0,0 +1,21 @@
+From: David Paleino <dapal at debian.org>
+Subject: don't compile datum files, as we're using the ones provided by
+ proj-data
+Origin: vendor
+Forwarded: not-needed
+
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- python-pyproj.orig/setup.py
++++ python-pyproj/setup.py
+@@ -7,7 +7,7 @@ extensions = [Extension("pyproj._proj",d
+ extensions.append(Extension("pyproj._geod",deps+['_geod.c'],include_dirs = ['src']))
+ 
+ # create binary datum shift grid files.
+-if sys.argv[1] != 'sdist':
++if False:
+     cc = ccompiler.new_compiler()
+     sysconfig.customize_compiler(cc)
+     cc.set_include_dirs(['src'])
diff --git a/debian/patches/series b/debian/patches/series
index 5b24c50..cbd9482 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-use_proj-data_instead_of_embedded.patch
+02-dont_compile_datums.patch

-- 
python interface to PROJ.4 library