[Python-modules-commits] r13741 - in packages/matplotlib/branches/experimental/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Thursday, July 1, 2010 @ 16:51:58
  Author: morph
Revision: 13741

debian/patches/{10_build_fix.patch, 20_matplotlibrc_path_search_fix.patch}

Modified:
  packages/matplotlib/branches/experimental/debian/changelog
  packages/matplotlib/branches/experimental/debian/patches/20_matplotlibrc_path_search_fix.patch

Modified: packages/matplotlib/branches/experimental/debian/changelog
===================================================================
--- packages/matplotlib/branches/experimental/debian/changelog	2010-07-01 12:10:17 UTC (rev 13740)
+++ packages/matplotlib/branches/experimental/debian/changelog	2010-07-01 16:51:58 UTC (rev 13741)
@@ -1,10 +1,10 @@
 matplotlib (1.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release (first RC of upcoming 1.0 release)
-  * debian/patches/10_build_fix.patch
+  * debian/patches/{10_build_fix.patch, 20_matplotlibrc_path_search_fix.patch}
     - updated to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Wed, 30 Jun 2010 20:06:34 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 01 Jul 2010 18:51:38 +0200
 
 matplotlib (0.99.3-1) unstable; urgency=low
 

Modified: packages/matplotlib/branches/experimental/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/branches/experimental/debian/patches/20_matplotlibrc_path_search_fix.patch	2010-07-01 12:10:17 UTC (rev 13740)
+++ packages/matplotlib/branches/experimental/debian/patches/20_matplotlibrc_path_search_fix.patch	2010-07-01 16:51:58 UTC (rev 13741)
@@ -2,23 +2,25 @@
 Forwarded: not-needed
 Author: Sandro Tosi <morph at debian.org>
 
---- matplotlib-0.98.3.orig/lib/matplotlib/__init__.py	2008-08-22 11:52:37.253904720 +0200
-+++ matplotlib-0.98.3/lib/matplotlib/__init__.py	2008-08-22 11:52:42.250189441 +0200
-@@ -453,9 +453,11 @@
+Index: matplotlib-1.0~rc1/lib/matplotlib/__init__.py
+===================================================================
+--- matplotlib-1.0~rc1.orig/lib/matplotlib/__init__.py	2010-06-29 15:30:11.000000000 +0200
++++ matplotlib-1.0~rc1/lib/matplotlib/__init__.py	2010-07-01 18:48:46.494542076 +0200
+@@ -489,10 +489,12 @@
              raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
          return path
  
 -    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
 +    path = '/usr/share/matplotlib/mpl-data'
-     if os.path.isdir(path): return path
--
-+    
+     if os.path.isdir(path):
+         return path
+ 
 +    raise RuntimeError('Could not find the matplotlib data files')
-+    
++
      # setuptools' namespace_packages may highjack this init file
      # so need to try something known to be in matplotlib, not basemap
      import matplotlib.afm
-@@ -566,7 +568,7 @@
+@@ -600,7 +602,7 @@
      if os.path.exists(fname): return fname