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

[morph at users.alioth.debian.org]

    Date: Saturday, June 12, 2010 @ 08:02:37
  Author: morph
Revision: 13403

* debian/patches/10_build_fix.patch
  - adapted to new upstream code

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2010-06-12 07:53:48 UTC (rev 13402)
+++ packages/matplotlib/trunk/debian/changelog	2010-06-12 08:02:37 UTC (rev 13403)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/05-find-tcl-tk-directory.patch
     - removed, now merged upstream
+  * debian/patches/10_build_fix.patch
+    - adapted to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Sat, 12 Jun 2010 09:53:25 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 12 Jun 2010 10:02:11 +0200
 
 matplotlib (0.99.1.2-3) unstable; urgency=low
 

Modified: packages/matplotlib/trunk/debian/patches/10_build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2010-06-12 07:53:48 UTC (rev 13402)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2010-06-12 08:02:37 UTC (rev 13403)
@@ -3,12 +3,18 @@
 Author: Sandro Tosi <morph at debian.org>
 Last-Update: 2010-02-06
 
---- matplotlib-0.99.1.2.orig/setupext.py
-+++ matplotlib-0.99.1.2/setupext.py
-@@ -47,8 +47,12 @@ import subprocess
+Index: matplotlib-0.99.3/setupext.py
+===================================================================
+--- matplotlib-0.99.3.orig/setupext.py	2010-03-09 15:20:20.000000000 +0100
++++ matplotlib-0.99.3/setupext.py	2010-06-12 10:01:18.165019669 +0200
+@@ -47,12 +47,12 @@
  
  basedir = {
      'win32'  : ['win32_static',],
+-    'linux2-alpha' : ['/usr/local', '/usr'],
+-    'linux2-hppa' : ['/usr/local', '/usr'],
+-    'linux2-mips' : ['/usr/local', '/usr'],
+-    'linux2-sparc' : ['/usr/local', '/usr'],
 -    'linux2' : ['/usr/local', '/usr'],
 -    'linux'  : ['/usr/local', '/usr',],
 +    'linux2-alpha' : ['/usr'],
@@ -20,12 +26,14 @@
      'cygwin' : ['/usr/local', '/usr',],
      '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
                  '/usr', '/sw'],
-@@ -63,9 +67,12 @@ basedir = {
+@@ -67,11 +67,12 @@
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
      'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
 -    'gnukfreebsd5' : ['/usr/local', '/usr'],
 -    'gnukfreebsd6' : ['/usr/local', '/usr'],
+-    'gnukfreebsd7' : ['/usr/local', '/usr'],
+-    'gnukfreebsd8' : ['/usr/local', '/usr'],
 +    'gnukfreebsd5' : ['/usr'],
 +    'gnukfreebsd6' : ['/usr'],
 +    'gnukfreebsd7' : ['/usr'],