Package: matplotlib
Version: 0.98.3-3
Severity: serious
Tags: patch

Matplotlib FTBFS due to a recent change in the platform identifier
for alpha, hppa, mips, mipsel and sparc. The attached patch is an
update to debian/patches/build_fix.patch which fixes the problem.


Thiemo
Index: matplotlib-0.98.3/setupext.py
===================================================================
--- matplotlib-0.98.3.orig/setupext.py	2008-10-08 23:30:35.000000000 +0000
+++ matplotlib-0.98.3/setupext.py	2008-10-08 23:31:19.000000000 +0000
@@ -47,8 +47,12 @@
 
 basedir = {
     'win32'  : ['win32_static',],
-    'linux2' : ['/usr/local', '/usr'],
-    'linux'  : ['/usr/local', '/usr',],
+    'linux2-alpha' : ['/usr'],
+    'linux2-hppa' : ['/usr'],
+    'linux2-mips' : ['/usr'],
+    'linux2-sparc' : ['/usr'],
+    '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 @@
     'freebsd5' : ['/usr/local', '/usr'],
     'freebsd6' : ['/usr/local', '/usr'],
     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
-    'gnukfreebsd5' : ['/usr/local', '/usr'],
-    'gnukfreebsd6' : ['/usr/local', '/usr'],
+    'gnukfreebsd5' : ['/usr'],
+    'gnukfreebsd6' : ['/usr'],
+    'gnukfreebsd7' : ['/usr'],
+    'gnukfreebsd8' : ['/usr'],
     'aix5' : ['/usr/local'],
 }
 
@@ -977,6 +983,10 @@
         tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
                                                        '../../include'))
 
+    if not os.path.exists(tk_inc):
+        tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
+                                               '../../../include/tcl' + tk_ver))
+
     if not os.path.exists(os.path.join(tk_inc, 'tk.h')):
         tk_inc = tcl_inc
 
@@ -994,10 +1004,10 @@
     return tcl_lib, tcl_inc, tk_lib, tk_inc
 
 def hardcoded_tcl_config():
-    tcl_inc = "/usr/local/include"
-    tk_inc = "/usr/local/include"
-    tcl_lib = "/usr/local/lib"
-    tk_lib = "/usr/local/lib"
+    tcl_inc = "/usr/include/tcl8.4"
+    tk_inc = "/usr/include/tcl8.4"
+    tcl_lib = "/usr/lib"
+    tk_lib = "/usr/lib"
     return tcl_lib, tcl_inc, tk_lib, tk_inc
 
 def add_tk_flags(module):

Reply via email to