Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv23500
Modified Files:
scipy-py.info scientificpython-py.info scipy-py.patch
scientificpython-py.patch
Log Message:
new upstream version
Index: scipy-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-py.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scipy-py.patch 26 Aug 2007 12:22:56 -0000 1.5
+++ scipy-py.patch 22 Sep 2007 16:16:47 -0000 1.6
@@ -1,6 +1,20 @@
---- scipy/Lib/sandbox/setup.py.orig 2006-09-08 10:34:46.000000000 -0600
-+++ scipy/Lib/sandbox/setup.py 2006-09-08 10:36:48.000000000 -0600
-@@ -47,40 +47,40 @@
+--- scipy/scipy/sandbox/setup.py.orig 2007-09-22 07:45:51.000000000 -0600
++++ scipy/scipy/sandbox/setup.py 2007-09-22 07:45:57.000000000 -0600
+@@ -34,58 +34,58 @@
+ # check it in and screw other people up :-)
+
+ # An example package:
+- #config.add_subpackage('exmplpackage')
++ config.add_subpackage('exmplpackage')
+
+ # Monte Carlo package
+ #config.add_subpackage('montecarlo')
+
+ # Robert Kern's corner:
+- #config.add_subpackage('rkern')
++ config.add_subpackage('rkern')
+
+ # ODRPACK
#config.add_subpackage('odr')
# Delaunay triangulation and Natural Neighbor interpolation
@@ -17,7 +31,7 @@
# Statistical models
- #config.add_subpackage('models')
-+ #config.add_subpackage('models')
++ config.add_subpackage('models')
# Adaptation of Scientific.IO (2.4.9) to use NumPy
- #config.add_subpackage('netcdf')
@@ -33,7 +47,7 @@
# Interpolating between sparse samples
- #config.add_subpackage('buildgrid')
-+ #config.add_subpackage('buildgrid')
++ config.add_subpackage('buildgrid')
# Package for Support Vector Machine
- #config.add_subpackage('svm')
@@ -45,30 +59,19 @@
# David Cournapeau's corner: autocorrelation, lpc, lpc residual
- #config.add_subpackage('cdavid')
-+ #config.add_subpackage('cdavid')
++ config.add_subpackage('cdavid')
# New spline package (based on scipy.interpolate)
- #config.add_subpackage('spline')
+ config.add_subpackage('spline')
+
+ # Radial basis functions package
+- #config.add_subpackage('rbf')
++ config.add_subpackage('rbf')
- return config
+ # Multigrid Solvers
+- #config.add_subpackage('multigrid')
++ config.add_subpackage('multigrid')
---- scipy/Lib/fftpack/setup.py.old 2007-08-23 14:40:09.000000000 -0400
-+++ scipy/Lib/fftpack/setup.py 2007-08-23 14:40:36.000000000 -0400
-@@ -30,7 +30,7 @@
- config.add_extension('_fftpack',
- sources=sources,
- libraries=['dfftpack'],
-- extra_info = fft_opt_info
-+ extra_info = [fft_opt_info, djbfft_info],
- )
- config.add_extension('convolve',
---- scipy/Lib/signal/filter_design.py.old 2007-08-20 22:43:50.000000000
-0400
-+++ scipy/Lib/signal/filter_design.py 2007-08-23 15:10:19.000000000 -0400
-@@ -1539,4 +1539,4 @@
- alpha = N//2
- m = numpy.arange(0,N)
- h = win*special.sinc(cutoff*(m-alpha))
-- return h / sum(h,axis=0)
-+ return h / numpy.sum(h,axis=0)
+ return config
Index: scientificpython-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scientificpython-py.patch 20 Jan 2006 20:30:40 -0000 1.1
+++ scientificpython-py.patch 22 Sep 2007 16:16:47 -0000 1.2
@@ -1,20 +1,20 @@
---- ScientificPython/setup.py.orig Sat Feb 21 16:47:37 2004
-+++ ScientificPython/setup.py Sat Feb 21 16:48:34 2004
-@@ -32,7 +32,7 @@
- ['Src/Scientific_netcdf.c'],
- include_dirs=['Include', netcdf_include],
+--- ScientificPython/setup.py.orig 2007-09-22 07:31:15.000000000 -0600
++++ ScientificPython/setup.py 2007-09-22 07:32:39.000000000 -0600
+@@ -61,7 +61,7 @@
+ include_dirs=['Include', netcdf_include]
+ + arrayobject_h_include,
library_dirs=[netcdf_lib],
-- libraries = ['netcdf'])]
-+ libraries = ['nc-dap','dap'])]
-
- packages = ['Scientific', 'Scientific.Functions',
- 'Scientific.Geometry', 'Scientific.IO',
---- ScientificPython/Src/Scientific_netcdf.c.orig Fri Sep 16 13:08:17 2005
-+++ ScientificPython/Src/Scientific_netcdf.c Fri Sep 16 13:08:54 2005
-@@ -11,7 +11,7 @@
+- libraries = ['netcdf'],
++ libraries = ['nc-dap','dap'],
+ extra_compile_args=extra_compile_args)]
- #include "Python.h"
+ cmdclass = {}
+--- ScientificPython/Src/Scientific_netcdf.c.orig 2007-09-22
07:33:10.000000000 -0600
++++ ScientificPython/Src/Scientific_netcdf.c 2007-09-22 07:33:23.000000000
-0600
+@@ -19,7 +19,7 @@
#include "Numeric/arrayobject.h"
+ #endif
+ #endif
-#include "netcdf.h"
+#include "libnc-dap/netcdf.h"
Index: scipy-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-py.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scipy-py.info 26 Aug 2007 12:22:56 -0000 1.19
+++ scipy-py.info 22 Sep 2007 16:16:47 -0000 1.20
@@ -1,16 +1,16 @@
Info2: <<
Package: scipy-py%type_pkg[python]
-Version: 0.5.2.1
+Version: 0.6.0
Epoch: 1
Revision: 2
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
-Depends: scipy-core-py%type_pkg[python] (>= 1.0.3-1), python%type_pkg[python]
| python%type_pkg[python]-nox, fftw3-shlibs, netcdf-shlibs
-BuildDepends: fftw3, g95 (>= 0.90-1), netcdf, djbfft (>= 0.76-3)
+Depends: scipy-core-py%type_pkg[python] (>= 1.0.3-1), python%type_pkg[python]
| python%type_pkg[python]-nox, fftw3-shlibs
+BuildDepends: fftw3, g95 (>= 0.90-1), djbfft (>= 0.76-3)
Source: mirror:sourceforge:scipy/scipy-%v.tar.gz
-Source-MD5: 8d9083b94b0bbbc96a96099f68e62526
+Source-MD5: 417adf3bfe03f4c23c9fb265018e545c
Patch: %{ni}.patch
CompileScript: <<
%p/bin/python%type_raw[python] setup.py config_fc --fcompiler=g95 build
Index: scientificpython-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scientificpython-py.info 16 Jun 2007 22:30:55 -0000 1.8
+++ scientificpython-py.info 22 Sep 2007 16:16:47 -0000 1.9
@@ -1,22 +1,22 @@
Info2: <<
Package: scientificpython-py%type_pkg[python]
-Version: 2.4.11
-Revision: 2
+Version: 2.7.6
+Revision: 1
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Type: python (2.3 2.4 2.5)
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python], numeric-py%type_pkg[python],
libnc-dap3-shlibs (>= 3.5.2-1001), libdap3-shlibs (>= 3.5.2-1001)
-BuildDepends: libnc-dap3 (>= 3.5.2-1001), libdap3 (>= 3.5.2-1001)
+Depends: python%type_pkg[python], scipy-core-py%type_pkg[python],
libnc-dap3-shlibs (>= 3.5.2-1001), libdap6-shlibs
+BuildDepends: libnc-dap3 (>= 3.7.0-1), libdap6
Replaces: scientificpython
-Source: http://sourcesup.cru.fr/frs/download.php/686/scientificpython-%v.tar.gz
-Source-MD5: 387878545731da56e5a798de04588439
+Source:
http://sourcesup.cru.fr/frs/download.php/1392/scientificpython-%v.tar.gz
+Source-MD5: 1e118671f45b0d19927b792fe56c07e8
SourceDirectory: ScientificPython-%v
Patch: %{ni}.patch
CompileScript: <<
#!/bin/sh -ev
export NETCDF_PREFIX=%p
- %p/bin/python%type_raw[python] setup.py build
+ %p/bin/python%type_raw[python] setup.py build --numpy
<<
InstallScript: <<
#!/bin/sh -ev
@@ -27,8 +27,7 @@
mv %i/bin/bsp_virtual %i/bin/bsp_virtual%type_raw[python]
ln -s %p/bin/bsp_virtual%type_raw[python] %i/bin/bsp_virtual
cp -R Examples %i/share/doc/%n
- cp -R Doc/HTML %i/share/doc/%n
- cp -R Doc/PDF %i/share/doc/%n
+ cp -R Doc/* %i/share/doc/%n
<<
SplitOff: <<
Package: scientificpython-py%type_pkg[python]-bin
@@ -39,7 +38,7 @@
DocFiles: README LICENSE
<<
License: OSI-Approved
-DocFiles: README LICENSE
+DocFiles: README LICENSE
Description: Python modules for scientific computing
DescDetail: <<
In this collection you will find modules that
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
