[Python-modules-commits] r19319 - in packages/basemap/trunk/debian/patches (use_share_datafiles)

[morph at users.alioth.debian.org]

    Date: Sunday, November 13, 2011 @ 22:35:52
  Author: morph
Revision: 19319

add pyproj.py to use_share_datafiles patch

Modified:
  packages/basemap/trunk/debian/patches/use_share_datafiles

Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles	2011-11-13 21:56:48 UTC (rev 19318)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles	2011-11-13 22:35:52 UTC (rev 19319)
@@ -1,11 +1,11 @@
 Description: Use the datafile in the python-mpltoolkits.basemap-data package,
  if BASEMAPDATA is not set
 Author: Sandro Tosi <morph at debian.org>
-Index: basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py
+Index: basemap-1.0.2/lib/mpl_toolkits/basemap/__init__.py
 ===================================================================
---- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/__init__.py	2011-02-09 20:53:32.000000000 +0100
-+++ basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py	2011-09-19 00:11:05.648202868 +0200
-@@ -52,7 +52,7 @@
+--- basemap-1.0.2.orig/lib/mpl_toolkits/basemap/__init__.py	2011-11-05 18:02:51.000000000 +0100
++++ basemap-1.0.2/lib/mpl_toolkits/basemap/__init__.py	2011-11-13 23:27:01.537248719 +0100
+@@ -43,7 +43,7 @@
      if not os.path.isdir(basemap_datadir):
          raise RuntimeError('Path in environment BASEMAPDATA not a directory')
  else:
@@ -14,3 +14,16 @@
  
  __version__ = '1.0.2'
  
+Index: basemap-1.0.2/lib/mpl_toolkits/basemap/pyproj.py
+===================================================================
+--- basemap-1.0.2.orig/lib/mpl_toolkits/basemap/pyproj.py	2011-11-05 18:02:58.000000000 +0100
++++ basemap-1.0.2/lib/mpl_toolkits/basemap/pyproj.py	2011-11-13 23:27:29.891332974 +0100
+@@ -57,7 +57,7 @@
+ import os
+ #import numpy as np
+ 
+-pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
++pyproj_datadir = '/usr/share/basemap/data'
+ if not os.path.isdir(pyproj_datadir):
+     msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir
+     raise IOError(msg)