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

[morph at users.alioth.debian.org]

    Date: Saturday, January 4, 2014 @ 19:20:59
  Author: morph
Revision: 27057

patch refreshed

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

Modified: packages/basemap/trunk/debian/changelog
===================================================================
--- packages/basemap/trunk/debian/changelog	2014-01-04 18:51:19 UTC (rev 27056)
+++ packages/basemap/trunk/debian/changelog	2014-01-04 19:20:59 UTC (rev 27057)
@@ -6,8 +6,9 @@
 
   [ Sandro Tosi ]
   * New upstream release
+  * patch refreshed
 
- -- Sandro Tosi <morph at debian.org>  Sat, 04 Jan 2014 19:07:27 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 04 Jan 2014 20:20:49 +0100
 
 basemap (1.0.6+dfsg-1) experimental; urgency=low
 

Modified: packages/basemap/trunk/debian/patches/dont_install_data_files
===================================================================
--- packages/basemap/trunk/debian/patches/dont_install_data_files	2014-01-04 18:51:19 UTC (rev 27056)
+++ packages/basemap/trunk/debian/patches/dont_install_data_files	2014-01-04 19:20:59 UTC (rev 27057)
@@ -2,12 +2,10 @@
  separate arch:all package
 Author: Sandro Tosi <morph at debian.org>
 Forwarded: no
-Index: basemap-1.0.5+dfsg/setup.py
-===================================================================
---- basemap-1.0.5+dfsg.orig/setup.py	2012-08-07 23:51:27.498323226 +0200
-+++ basemap-1.0.5+dfsg/setup.py	2012-08-07 23:51:53.958603491 +0200
-@@ -134,6 +134,5 @@
-   packages          = packages,
+--- a/setup.py
++++ b/setup.py
+@@ -137,6 +137,5 @@ setup(
+   namespace_packages = namespace_packages,
    package_dir       = package_dirs,
    ext_modules       = extensions,
 -  cmdclass = {'build_py': build_py},

Modified: packages/basemap/trunk/debian/patches/use_share_datafiles
===================================================================
--- packages/basemap/trunk/debian/patches/use_share_datafiles	2014-01-04 18:51:19 UTC (rev 27056)
+++ packages/basemap/trunk/debian/patches/use_share_datafiles	2014-01-04 19:20:59 UTC (rev 27057)
@@ -1,24 +1,20 @@
 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.5+dfsg/lib/mpl_toolkits/basemap/__init__.py
-===================================================================
---- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/__init__.py	2012-08-06 19:25:57.000000000 +0200
-+++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/__init__.py	2012-08-10 21:50:52.706019305 +0200
-@@ -44,7 +44,7 @@
+--- a/lib/mpl_toolkits/basemap/__init__.py
++++ b/lib/mpl_toolkits/basemap/__init__.py
+@@ -45,7 +45,7 @@ if 'BASEMAPDATA' in os.environ:
      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'])
 +    basemap_datadir = '/usr/share/basemap/data'
  
- __version__ = '1.0.6'
+ __version__ = '1.0.7'
  
-Index: basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py
-===================================================================
---- basemap-1.0.5+dfsg.orig/lib/mpl_toolkits/basemap/pyproj.py	2012-08-06 19:26:00.000000000 +0200
-+++ basemap-1.0.5+dfsg/lib/mpl_toolkits/basemap/pyproj.py	2012-08-10 21:49:42.941275370 +0200
-@@ -236,10 +236,14 @@
+--- a/lib/mpl_toolkits/basemap/pyproj.py
++++ b/lib/mpl_toolkits/basemap/pyproj.py
+@@ -235,10 +235,14 @@ pj_ellps={
  "sphere":       {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"},
  }