Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24947
Modified Files:
matplotlib-basemap-data.info matplotlib-basemap-py.info
matplotlib-py.info matplotlib-py.patch
Log Message:
New upstream version
Index: matplotlib-basemap-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-basemap-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- matplotlib-basemap-py.info 8 Feb 2006 22:22:20 -0000 1.6
+++ matplotlib-basemap-py.info 9 Jun 2006 12:05:37 -0000 1.7
@@ -1,15 +1,14 @@
Info2: <<
Package: matplotlib-basemap-py%type_pkg[python]
-Version: 0.8.1
+Version: 0.9
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.84),
matplotlib-basemap-data (>= 0.7)
+Depends: python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.87.3),
matplotlib-basemap-data (>= 0.9)
Source: mirror:sourceforge:matplotlib/basemap-%v.tar.gz
-Source-MD5: b7dd2e60cdbd73130195c7b3a462d542
+Source-MD5: f4101f64f7e8036a075e40a0d9ad57ba
Type: python (2.3 2.4)
GCC: 3.3
-Patch: %{ni}.patch
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
CompileScript: <<
Index: matplotlib-basemap-data.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-basemap-data.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matplotlib-basemap-data.info 22 Sep 2005 13:00:56 -0000 1.1
+++ matplotlib-basemap-data.info 9 Jun 2006 12:05:37 -0000 1.2
@@ -1,10 +1,10 @@
Package: matplotlib-basemap-data
-Version: 0.7
+Version: 0.9
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: python
Source: mirror:sourceforge:matplotlib/basemap-data-%v.tar.gz
-Source-MD5: 8f745d4575e996348e3b315859b354e0
+Source-MD5: 5c4baf8f3de54193d64ab31c363a0e89
CompileScript: <<
#!/bin/sh -ev
%p/bin/python setup.py build
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- matplotlib-py.patch 22 Feb 2006 23:54:03 -0000 1.20
+++ matplotlib-py.patch 9 Jun 2006 12:05:37 -0000 1.21
@@ -1,27 +1,18 @@
--- matplotlib/setupext.py.orig 2006-01-14 10:51:44.000000000 -0700
+++ matplotlib/setupext.py 2006-01-14 10:53:23.000000000 -0700
-@@ -38,8 +38,7 @@
+@@ -48,8 +48,7 @@
'linux2' : ['/usr/local', '/usr',],
'linux' : ['/usr/local', '/usr',],
'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw'],
-+ 'darwin' : ['@PREFIX@/lib/freetype219', '/usr/local', '/usr', '@PREFIX@'],
++ 'darwin' : ['/sw/lib/freetype219', '/usr/local', '/usr', '/sw'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -294,44 +293,12 @@
-
- def find_tcltk():
- """Finds Tcl/Tk includes/libraries/version by interrogating Tkinter."""
-- try:
-- import Tkinter
-- except:
-- print "Tkinter not properly installed\n"
-- sys.exit(1)
-- if Tkinter.TkVersion < 8.3:
-- print "Tcl/Tk v8.3 or later required\n"
-- sys.exit(1)
+@@ -333,44 +332,11 @@
+ print "Tcl/Tk v8.3 or later required\n"
+ sys.exit(1)
o = FoundTclTk()
- try:
- tk=Tkinter.Tk()
@@ -49,13 +40,22 @@
- if not os.path.exists(o.tk_inc):
- o.tk_inc = os.path.join((tk.getvar('tk_library')),
- '../../include')
+-
+- if not os.path.exists(o.tcl_inc):
+- # this is a hack for suse linux, which is broken
+- if (sys.platform.startswith('linux') and
+- os.path.exists('/usr/include/tcl.h') and
+- os.path.exists('/usr/include/tk.h')):
+- o.tcl_inc = '/usr/include/'
+- o.tk_inc = '/usr/include/'
+-
- if not os.path.exists(o.tcl_inc):
- print 'cannot find tcl/tk headers. giving up.'
- sys.exit()
-+ o.tcl_lib = "@PREFIX@/lib"
-+ o.tcl_inc = "@PREFIX@/include"
-+ o.tk_lib = "@PREFIX@/lib"
-+ o.tk_inc = "@PREFIX@/include"
++ o.tcl_lib = "/sw/lib"
++ o.tcl_inc = "/sw/include"
++ o.tk_lib = "/sw/lib"
++ o.tk_inc = "/sw/include"
+ o.tkv = ""
return o
@@ -139,25 +139,3 @@
# packagers: set rc['numerix'] and rc['backend'] here to override the auto
---- matplotlib/lib/matplotlib/cm.py.orig 2006-02-22 15:28:42.000000000
-0700
-+++ matplotlib/lib/matplotlib/cm.py 2006-02-22 15:28:59.000000000 -0700
-@@ -49,7 +49,7 @@
-
- def to_rgba(self, x, alpha=1.0):
- # assume normalized rgb, rgba
-- if len(x.shape)>2: return x
-+ if hasattr(x, 'shape') and len(x.shape)>2: return x
- x = ma.asarray(x)
- x = self.norm(x)
- x = self.cmap(x, alpha)
---- matplotlib/lib/matplotlib/colors.py.orig 2006-02-22 15:27:17.000000000
-0700
-+++ matplotlib/lib/matplotlib/colors.py 2006-02-22 15:27:42.000000000
-0700
-@@ -656,7 +656,7 @@
- else:
- if self.clip:
- val = clip(val.filled(vmax), vmin, vmax)
-- result = (1.0/(vmax-vmin))*(val-vmin)
-+ result = (val-vmin)/(vmax-vmin)
- if vtype == 'scalar':
- result = result[0]
- return result
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- matplotlib-py.info 22 Feb 2006 23:54:03 -0000 1.30
+++ matplotlib-py.info 9 Jun 2006 12:05:37 -0000 1.31
@@ -1,13 +1,13 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.87
+Version: 0.87.3
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python] (>= 1.5.0-1), numeric-py%type_pkg[python] (>=
24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>=
0.9.5-1)
+Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python] (>= 1.5.0-1), numeric-py%type_pkg[python] (>=
24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>=
0.9.8-1)
BuildDepends: pygtk2-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev,
atk1, pango1-xft2-dev, libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, pkgconfig, freetype219, libpng3
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 4ffff13865b37e8e39719d266419c976
+Source-MD5: 9e961e90be07701ab6a99aa8cdc6b831
Type: python (2.3 2.4)
GCC: 3.3
NoSetCPPFLAGS: True
@@ -16,7 +16,6 @@
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed
's|@PYVER@|%type_pkg[python]|g' | patch -p1
CompileScript: <<
#!/bin/sh -ev
- export CXX=gcc
%p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
