Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30225
Modified Files:
scipy-core-py.info matplotlib-py.info matplotlib-py.patch
Log Message:
new upstream version.
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matplotlib-py.patch 10 Sep 2006 21:50:09 -0000 1.8
+++ matplotlib-py.patch 28 Oct 2006 22:10:17 -0000 1.9
@@ -1,16 +1,15 @@
---- matplotlib/setupext.py.orig 2006-01-14 10:51:44.000000000 -0700
-+++ matplotlib/setupext.py 2006-01-14 10:53:23.000000000 -0700
-@@ -48,8 +48,7 @@
- 'linux2' : ['/usr/local', '/usr',],
+--- matplotlib/setupext.py.orig 2006-10-28 07:29:32.000000000 -0600
++++ matplotlib/setupext.py 2006-10-28 07:30:35.000000000 -0600
+@@ -49,7 +49,7 @@
'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/freetype2', '/sw/lib/freetype219', '/usr/local',
+- '/usr', '/sw'],
++ '/usr', '/sw'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
- 'freebsd6' : ['/usr/local', '/usr'],
-@@ -333,57 +332,12 @@
+ 'freebsd6' : ['/usr/local', '/usr'],
+@@ -334,57 +334,12 @@
def find_tcltk():
"""Finds Tcl/Tk includes/libraries/version by interrogating Tkinter."""
@@ -24,7 +23,7 @@
- sys.exit(1)
o = FoundTclTk()
- try:
-- tk=Tkinter.Tk()
+- tk=Tkinter.Tk()
- except Tkinter.TclError:
- print "Using default library and include directories for Tcl and Tk
because a"
- print "Tk window failed to open. You may need to define DISPLAY for
Tk to work"
@@ -39,29 +38,29 @@
- o.tcl_lib =
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), '../'))
- o.tk_lib =
os.path.normpath(os.path.join(str(tk.getvar('tk_library')), '../'))
- o.tkv = str(Tkinter.TkVersion)[:3]
-- o.tcl_inc =
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')),
+- o.tcl_inc =
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')),
- '../../include/tcl'+o.tkv))
- if not os.path.exists(o.tcl_inc):
-- o.tcl_inc =
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')),
+- o.tcl_inc =
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')),
- '../../include'))
-- o.tk_inc =
os.path.normpath(os.path.join(str(tk.getvar('tk_library')),
+- o.tk_inc = os.path.normpath(os.path.join(str(tk.getvar('tk_library')),
- '../../include/tk'+o.tkv))
- if not os.path.exists(o.tk_inc):
-- o.tk_inc =
os.path.normpath(os.path.join(str(tk.getvar('tk_library')),
+- o.tk_inc =
os.path.normpath(os.path.join(str(tk.getvar('tk_library')),
- '../../include'))
--
+-
- if ((not os.path.exists(os.path.join(o.tk_inc,'tk.h'))) and
- os.path.exists(os.path.join(o.tcl_inc,'tk.h'))):
- o.tk_inc = o.tcl_inc
--
-- if not os.path.exists(o.tcl_inc):
+-
+- 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()
@@ -73,8 +72,8 @@
return o
---- matplotlib/setup.py.orig 2006-01-14 10:57:11.000000000 -0700
-+++ matplotlib/setup.py 2006-01-14 11:00:55.000000000 -0700
+--- matplotlib/setup.py.orig 2006-10-28 07:29:41.000000000 -0600
++++ matplotlib/setup.py 2006-10-28 07:33:18.000000000 -0600
@@ -28,21 +28,21 @@
# it. It makes very nice antialiased output and also supports alpha
# blending
@@ -102,7 +101,7 @@
VERBOSE = False # insert lots of diagnostic prints in extension code
-@@ -201,47 +201,20 @@
+@@ -201,80 +201,22 @@
build_enthought(ext_modules, packages)
if BUILD_GTK:
@@ -110,27 +109,72 @@
- import gtk
- except ImportError:
- print 'GTK requires pygtk'
-- BUILD_GTK=0
+- BUILD_GTK = 0
- except RuntimeError:
- print 'pygtk present but import failed'
--
--if BUILD_GTK:
- build_gdk(ext_modules, packages, NUMERIX)
- rc['backend'] = 'GTK'
+- BUILD_GTK = 0
+- else:
+- version = (2,2,0)
+- if gtk.pygtk_version < version:
+- print "Error: GTK backend requires PyGTK %d.%d.%d (or later), " \
+- "%d.%d.%d was detected." % (
+- version + gtk.pygtk_version)
+- BUILD_GTK = 0
+- else:
+- build_gdk(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'GTK'
++ build_gdk(ext_modules, packages, NUMERIX)
++ rc['backend'] = 'GTK'
+
+ if BUILD_GTKAGG:
+- try:
+- import gtk
+- except ImportError:
+- print 'GTKAgg requires pygtk'
+- BUILD_GTKAGG=0
+- except RuntimeError:
+- print 'pygtk present but import failed'
+- BUILD_GTKAGG = 0
+- else:
+- version = (2,2,0)
+- if gtk.pygtk_version < version:
+- print "Error: GTKAgg backend requires PyGTK %d.%d.%d " \
+- "(or later), %d.%d.%d was detected." % (
+- version + gtk.pygtk_version)
+- BUILD_GTKAGG=0
+- else:
+- BUILD_AGG = 1
+- build_gtkagg(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'GTKAgg'
++ build_gtkagg(ext_modules, packages, NUMERIX)
++ rc['backend'] = 'GTKAgg'
if BUILD_TKAGG:
-- try: import Tkinter
-- except ImportError: print 'TKAgg requires TkInter'
+- try:
+- import Tkinter
+- except ImportError:
+- print 'TKAgg requires TkInter'
+- BUILD_TKAGG = 0
+- except RuntimeError:
+- print 'Tkinter present but import failed'
+- BUILD_TKAGG = 0
- else:
-- BUILD_AGG = 1
-- build_tkagg(ext_modules, packages, NUMERIX)
-- rc['backend'] = 'TkAgg'
-+ BUILD_AGG = 1
+- try:
+- tk = Tkinter.Tk()
+- tk.withdraw()
+- except Tkinter.TclError:
+- print 'Tkinter present, but window failed to open'
+- BUILD_TKAGG = 0
+- else:
+- BUILD_AGG = 1
+- build_tkagg(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'TkAgg'
+ build_tkagg(ext_modules, packages, NUMERIX)
+ rc['backend'] = 'TkAgg'
-
+
if BUILD_WXAGG:
-- try: import wxPython
+- try:
+- import wxPython
- except ImportError:
- if BUILD_WXAGG != 'auto':
- print 'WXAgg\'s accelerator requires wxPython'
@@ -141,30 +185,19 @@
- not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
- and BUILD_WXAGG.lower() == 'auto')) # is "auto"
- rc['backend'] = 'WXAgg'
--
--if BUILD_GTKAGG:
-- try:
-- import gtk
-- except ImportError:
-- print 'GTKAgg requires pygtk'
-- BUILD_GTKAGG=0
-- except RuntimeError:
-- print 'pygtk present but import failed'
-+ BUILD_AGG = 1
+ build_wxagg(ext_modules, packages, NUMERIX,
+ not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
+ and BUILD_WXAGG.lower() == 'auto')) # is "auto"
+ rc['backend'] = 'WXAgg'
- if BUILD_GTKAGG:
- BUILD_AGG = 1
-@@ -270,6 +243,9 @@
+ if BUILD_AGG:
+ build_agg(ext_modules, packages, NUMERIX)
+@@ -298,6 +240,8 @@
for mod in ext_modules:
if VERBOSE:
mod.extra_compile_args.append('-DVERBOSE')
+ mod.include_dirs.append('@PREFIX@/include')
+ mod.library_dirs.append('@PREFIX@/lib')
-+
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- matplotlib-py.info 29 Sep 2006 15:46:36 -0000 1.11
+++ matplotlib-py.info 28 Oct 2006 22:10:17 -0000 1.12
@@ -1,13 +1,13 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.87.6
-Revision: 2
+Version: 0.87.7
+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.2-1), numeric-py%type_pkg[python] (>=
24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>=
1.0-1)
+Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python] (>= 1.5.2-1), numeric-py%type_pkg[python] (>=
24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>=
1.0-4)
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: 30c30e10d2338c56ae5b31f0adf325f5
+Source-MD5: cca3d3a644c1a84d6dcf4af8a9856b7b
Type: python (2.3 2.4 2.5)
GCC: 4.0
NoSetCPPFLAGS: True
Index: scipy-core-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scipy-core-py.info 13 Oct 2006 18:17:02 -0000 1.9
+++ scipy-core-py.info 28 Oct 2006 22:10:17 -0000 1.10
@@ -2,12 +2,12 @@
Package: scipy-core-py%type_pkg[python]
Version: 1.0
-Revision: 3
+Revision: 4
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
Depends: python%type_pkg[python] | python%type_pkg[python]-nox
-Source: mirror:sourceforge:numpy/numpy-%vrc2.tar.gz
-Source-MD5: 3ba2d29fcb314df296368ba40a60012b
+Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
+Source-MD5: 47dd0daa82e7b3f0fe74b969b388d7b3
Conflicts: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Replaces: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Provides: numpy-py%type_pkg[python], f2py-py%type_pkg[python]
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
