[SCM] python-pyproj branch, master, updated. debian/1.8.8-3-6-g96c4232

[David Paleino]

The following commit has been merged in the master branch:
commit 9621b610927acfb0e1e34eb7c1a7986e125acd60
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 9 17:23:18 2011 +0100

    Patches refreshed

diff --git a/debian/changelog b/debian/changelog
index a5bb6e4..93e9b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 python-pyproj (1.8.9-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Patches refreshed
 
- -- David Paleino <dapal at debian.org>  Wed, 09 Mar 2011 17:18:31 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 09 Mar 2011 17:23:12 +0100
 
 python-pyproj (1.8.8-3) unstable; urgency=low
 
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 5fe20b3..bcd3baa 100644
--- a/debian/patches/01-use_proj-data_instead_of_embedded.patch
+++ b/debian/patches/01-use_proj-data_instead_of_embedded.patch
@@ -8,12 +8,12 @@ Forwarded: not-needed
 
 --- python-pyproj.orig/lib/pyproj/__init__.py
 +++ python-pyproj/lib/pyproj/__init__.py
-@@ -55,7 +55,7 @@ from types import TupleType, ListType, N
+@@ -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/"
- set_datapath(pyproj_datadir)
- 
- class Proj(_Proj):
+ if not os.path.isdir(pyproj_datadir):
+     msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir
+     raise IOError(msg)
diff --git a/debian/patches/02-dont_compile_datums.patch b/debian/patches/02-dont_compile_datums.patch
index d924990..18ecd7f 100644
--- a/debian/patches/02-dont_compile_datums.patch
+++ b/debian/patches/02-dont_compile_datums.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
 
 --- 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']))
+@@ -8,7 +8,7 @@ extensions.append(Extension("pyproj._geo
  
  # 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()

-- 
python interface to PROJ.4 library