[Python-modules-commits] r21960 - in packages/basemap/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, May 27, 2012 @ 20:50:52
  Author: morph
Revision: 21960

* debian/patches/use_share_datafiles
  - updated for new upstream code

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

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2012-05-27 20:49:06 UTC (rev 21959)
+++ packages/basemap/trunk/debian/changelog	2012-05-27 20:50:52 UTC (rev 21960)
@@ -7,8 +7,10 @@
     - extended packaging copyright years
   * debian/patches/dont_compile_nad2bin_on_clean
     - removed, merged upstream
+  * debian/patches/use_share_datafiles
+    - updated for new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Sun, 27 May 2012 22:48:33 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 27 May 2012 22:50:38 +0200
 
 basemap (1.0.2-3) unstable; urgency=low
 

Modified: packages/basemap/trunk/debian/patches/series
===================================================================
--- packages/basemap/trunk/debian/patches/series	2012-05-27 20:49:06 UTC (rev 21959)
+++ packages/basemap/trunk/debian/patches/series	2012-05-27 20:50:52 UTC (rev 21960)
@@ -1,4 +1,3 @@
-dont_compile_nad2bin_on_clean
 dont_install_data_files
 add_shebang_data_scripts
 use_share_datafiles

Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles	2012-05-27 20:49:06 UTC (rev 21959)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles	2012-05-27 20:50:52 UTC (rev 21960)
@@ -1,10 +1,10 @@
 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.2/lib/mpl_toolkits/basemap/__init__.py
+Index: basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/__init__.py
 ===================================================================
---- 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
+--- basemap-1.0.3+dfsg.orig/lib/mpl_toolkits/basemap/__init__.py	2012-05-18 00:39:30.000000000 +0200
++++ basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/__init__.py	2012-05-27 22:24:13.009145054 +0200
 @@ -43,7 +43,7 @@
      if not os.path.isdir(basemap_datadir):
          raise RuntimeError('Path in environment BASEMAPDATA not a directory')
@@ -12,15 +12,15 @@
 -    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 +    basemap_datadir = '/usr/share/basemap/data'
  
- __version__ = '1.0.2'
+ __version__ = '1.0.3'
  
-Index: basemap-1.0.2/lib/mpl_toolkits/basemap/pyproj.py
+Index: basemap-1.0.3+dfsg/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
+--- basemap-1.0.3+dfsg.orig/lib/mpl_toolkits/basemap/pyproj.py	2012-05-18 00:39:33.000000000 +0200
++++ basemap-1.0.3+dfsg/lib/mpl_toolkits/basemap/pyproj.py	2012-05-27 22:24:13.013145092 +0200
+@@ -236,7 +236,7 @@
+ "sphere":       {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"},
+ }
  
 -pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 +pyproj_datadir = '/usr/share/basemap/data'