[Python-modules-commits] r18610 - in packages/basemap/trunk/debian/patches (2 files)

[morph at users.alioth.debian.org]

    Date: Sunday, September 18, 2011 @ 19:52:03
  Author: morph
Revision: 18610

use the shared datafiles

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

Modified: packages/basemap/trunk/debian/patches/series
===================================================================
--- packages/basemap/trunk/debian/patches/series	2011-09-18 19:06:04 UTC (rev 18609)
+++ packages/basemap/trunk/debian/patches/series	2011-09-18 19:52:03 UTC (rev 18610)
@@ -1,3 +1,4 @@
 dont_compile_nad2bin_on_clean
 dont_install_data_files
 add_shebang_data_scripts
+use_share_datafiles

Added: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles	                        (rev 0)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles	2011-09-18 19:52:03 UTC (rev 18610)
@@ -0,0 +1,26 @@
+Index: basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py
+===================================================================
+--- basemap-1.0.1.orig/lib/mpl_toolkits/basemap/__init__.py	2011-09-18 21:11:30.058392111 +0200
++++ basemap-1.0.1/lib/mpl_toolkits/basemap/__init__.py	2011-09-18 21:12:12.867833384 +0200
+@@ -47,12 +47,15 @@
+ # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
+ # check to see if environment variable BASEMAPDATA set to a directory,
+ # and if so look for the data there.
+-if 'BASEMAPDATA' in os.environ:
+-    basemap_datadir = os.environ['BASEMAPDATA']
+-    if not os.path.isdir(basemap_datadir):
+-        raise RuntimeError('Path in environment BASEMAPDATA not a directory')
+-else:
+-    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
++#if 'BASEMAPDATA' in os.environ:
++#    basemap_datadir = os.environ['BASEMAPDATA']
++#    if not os.path.isdir(basemap_datadir):
++#        raise RuntimeError('Path in environment BASEMAPDATA not a directory')
++#else:
++#    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
++
++# On Debian, we have a shared location for datafiles
++basemap_datadir = '/usr/share/basemap/data'
+ 
+ __version__ = '1.0.1'
+