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

[bdrung-guest at users.alioth.debian.org]

    Date: Monday, December 28, 2009 @ 14:57:22
  Author: bdrung-guest
Revision: 10908

Refresh patches.

Modified:
  packages/matplotlib/trunk/debian/patches/10_build_fix.patch
  packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch

Modified: packages/matplotlib/trunk/debian/patches/10_build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2009-12-28 14:48:57 UTC (rev 10907)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2009-12-28 14:57:22 UTC (rev 10908)
@@ -18,9 +18,9 @@
 +    'linux2' : ['/usr'],
 +    'linux'  : ['/usr',],
      'cygwin' : ['/usr/local', '/usr',],
-     'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
-                 '/usr', '/sw', '/usr/X11R6'],
-@@ -56,8 +60,10 @@
+     '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+                 '/usr', '/sw'],
+@@ -63,8 +67,10 @@
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
      'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],

Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch	2009-12-28 14:48:57 UTC (rev 10907)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch	2009-12-28 14:57:22 UTC (rev 10908)
@@ -4,7 +4,7 @@
 
 --- 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
-@@ -452,9 +452,11 @@
+@@ -453,9 +453,11 @@
              raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
          return path
  
@@ -18,7 +18,7 @@
      # setuptools' namespace_packages may highjack this init file
      # so need to try something known to be in matplotlib, not basemap
      import matplotlib.afm
-@@ -549,7 +551,7 @@
+@@ -566,7 +568,7 @@
      if os.path.exists(fname): return fname