Date: Saturday, October 11, 2008 @ 16:23:46
Author: certik-guest
Revision: 6670
Thiemo's patch committed.
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/patches/build_fix.patch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2008-10-11 16:05:05 UTC (rev 6669)
+++ packages/matplotlib/trunk/debian/changelog 2008-10-11 16:23:46 UTC (rev 6670)
@@ -1,5 +1,6 @@
matplotlib (0.98.3-4) UNRELEASED; urgency=low
+ [ Sandro Tosi ]
* Release in collaboration with Benjamin Drung, from Ubuntu
* debian/control
- applied Benjamin Drung patch to split dep fields a package per line;
@@ -21,6 +22,10 @@
* debian/rules
- added build, clean and install for -dbg package
+ [ Ondrej Certik ]
+ * debian/patches/build_fix.patch updated thanks to Thiemo Seufer.
+ Closes: #501618
+
-- Sandro Tosi <matrixhasu at gmail.com> Mon, 25 Aug 2008 23:28:30 +0200
matplotlib (0.98.3-3) unstable; urgency=medium
Modified: packages/matplotlib/trunk/debian/patches/build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-10-11 16:05:05 UTC (rev 6669)
+++ packages/matplotlib/trunk/debian/patches/build_fix.patch 2008-10-11 16:23:46 UTC (rev 6670)
@@ -1,19 +1,23 @@
Index: matplotlib-0.98.3/setupext.py
===================================================================
---- matplotlib-0.98.3.orig/setupext.py 2008-08-05 17:43:30.063494149 +0200
-+++ matplotlib-0.98.3/setupext.py 2008-08-05 17:47:59.774864127 +0200
-@@ -47,8 +47,8 @@
+--- 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 +56,10 @@
+@@ -56,8 +60,10 @@
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
@@ -26,7 +30,7 @@
'aix5' : ['/usr/local'],
}
-@@ -977,6 +979,10 @@
+@@ -977,6 +983,10 @@
tk_inc = os.path.normpath(os.path.join(tk_lib_dir,
'../../include'))
@@ -37,7 +41,7 @@
if not os.path.exists(os.path.join(tk_inc, 'tk.h')):
tk_inc = tcl_inc
-@@ -994,10 +1000,10 @@
+@@ -994,10 +1004,10 @@
return tcl_lib, tcl_inc, tk_lib, tk_inc
def hardcoded_tcl_config():