Update to 0.12.0

Changes many - see doc/release/ in the source tarball for details

3 files changed, 403 insertions, 244 deletions

diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 69ee383dbbb..337f6c23587 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/10/16 08:00:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/14 00:28:53 markd Exp $
 
-DISTNAME=	scipy-0.7.2
-PKGNAME=	${PYPKGPREFIX}-scipy-0.7.2
-PKGREVISION=	1
+DISTNAME=	scipy-0.12.0
+PKGNAME=	${PYPKGPREFIX}-scipy-0.12.0
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scipy/}
 
@@ -14,6 +13,7 @@ LICENSE=	modified-bsd
 PYDISTUTILSPKG=	yes
 PLIST_SUBST+=   PYPKGPREFIX=${PYPKGPREFIX}
 USE_LANGUAGES+=	c c++ fortran
+PYTHON_VERSIONS_INCLUDE_3X=	yes
 MAKE_ENV+=	ATLAS=None
 
 # XXX Avoid picking up other compilers when installed
@@ -39,21 +39,27 @@ REPLACE_PYTHON+=	scipy/fftpack/setupscons.py
 REPLACE_PYTHON+=	scipy/fftpack/tests/test_basic.py
 REPLACE_PYTHON+=	scipy/fftpack/tests/test_helper.py
 REPLACE_PYTHON+=	scipy/fftpack/tests/test_pseudo_diffs.py
+REPLACE_PYTHON+=	scipy/fftpack/tests/test_real_transforms.py
 REPLACE_PYTHON+=	scipy/integrate/setup.py
 REPLACE_PYTHON+=	scipy/integrate/setupscons.py
 REPLACE_PYTHON+=	scipy/interpolate/fitpack.py
 REPLACE_PYTHON+=	scipy/interpolate/setup.py
 REPLACE_PYTHON+=	scipy/interpolate/setupscons.py
 REPLACE_PYTHON+=	scipy/interpolate/tests/test_fitpack.py
+REPLACE_PYTHON+=	scipy/interpolate/tests/test_fitpack2.py
 REPLACE_PYTHON+=	scipy/interpolate/tests/test_rbf.py
 REPLACE_PYTHON+=	scipy/io/arff/arffread.py
 REPLACE_PYTHON+=	scipy/io/arff/setup.py
+REPLACE_PYTHON+=	scipy/io/arff/tests/test_arffread.py
 REPLACE_PYTHON+=	scipy/io/arff/utils.py
+REPLACE_PYTHON+=	scipy/io/harwell_boeing/setup.py
+REPLACE_PYTHON+=	scipy/io/harwell_boeing/setupscons.py
 REPLACE_PYTHON+=	scipy/io/matlab/setup.py
+REPLACE_PYTHON+=	scipy/io/matlab/setupscons.py
 REPLACE_PYTHON+=	scipy/io/matlab/tests/test_mio.py
+REPLACE_PYTHON+=	scipy/io/matlab/tests/test_mio_funcs.py
 REPLACE_PYTHON+=	scipy/io/setup.py
 REPLACE_PYTHON+=	scipy/io/setupscons.py
-REPLACE_PYTHON+=	scipy/io/tests/test_array_import.py
 REPLACE_PYTHON+=	scipy/io/tests/test_mmio.py
 REPLACE_PYTHON+=	scipy/lib/blas/setup.py
 REPLACE_PYTHON+=	scipy/lib/blas/setupscons.py
@@ -63,20 +69,13 @@ REPLACE_PYTHON+=	scipy/lib/lapack/setupscons.py
 REPLACE_PYTHON+=	scipy/lib/lapack/tests/test_lapack.py
 REPLACE_PYTHON+=	scipy/lib/setup.py
 REPLACE_PYTHON+=	scipy/lib/setupscons.py
+REPLACE_PYTHON+=	scipy/linalg/setup.py
 REPLACE_PYTHON+=	scipy/linalg/setupscons.py
-REPLACE_PYTHON+=	scipy/linalg/tests/test_atlas_version.py
 REPLACE_PYTHON+=	scipy/linalg/tests/test_basic.py
 REPLACE_PYTHON+=	scipy/linalg/tests/test_blas.py
 REPLACE_PYTHON+=	scipy/linalg/tests/test_decomp.py
 REPLACE_PYTHON+=	scipy/linalg/tests/test_lapack.py
 REPLACE_PYTHON+=	scipy/linalg/tests/test_matfuncs.py
-REPLACE_PYTHON+=	scipy/maxentropy/examples/bergerexample.py
-REPLACE_PYTHON+=	scipy/maxentropy/examples/bergerexamplesimulated.py
-REPLACE_PYTHON+=	scipy/maxentropy/examples/conditionalexample2.py
-REPLACE_PYTHON+=	scipy/maxentropy/setup.py
-REPLACE_PYTHON+=	scipy/maxentropy/setupscons.py
-REPLACE_PYTHON+=	scipy/maxentropy/tests/test_maxentropy.py
-REPLACE_PYTHON+=	scipy/misc/ppimport.py
 REPLACE_PYTHON+=	scipy/odr/setup.py
 REPLACE_PYTHON+=	scipy/odr/setupscons.py
 REPLACE_PYTHON+=	scipy/optimize/setup.py
@@ -84,6 +83,7 @@ REPLACE_PYTHON+=	scipy/optimize/setupscons.py
 REPLACE_PYTHON+=	scipy/optimize/tests/test_zeros.py
 REPLACE_PYTHON+=	scipy/signal/setup.py
 REPLACE_PYTHON+=	scipy/signal/setupscons.py
+REPLACE_PYTHON+=	scipy/sparse/csgraph/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/dsolve/setup.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/dsolve/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/dsolve/umfpack/setup.py
@@ -93,7 +93,6 @@ REPLACE_PYTHON+=	scipy/sparse/linalg/dsolve/umfpack/tests/try_umfpack.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/arpack/setup.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/arpack/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
-REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/lobpcg/setup.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/lobpcg/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py
@@ -102,8 +101,10 @@ REPLACE_PYTHON+=	scipy/sparse/linalg/eigen/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/isolve/setup.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/isolve/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/isolve/tests/test_iterative.py
+REPLACE_PYTHON+=	scipy/sparse/linalg/isolve/tests/test_lgmres.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/setup.py
 REPLACE_PYTHON+=	scipy/sparse/linalg/setupscons.py
+REPLACE_PYTHON+=	scipy/sparse/linalg/tests/test_matfuncs.py
 REPLACE_PYTHON+=	scipy/sparse/setup.py
 REPLACE_PYTHON+=	scipy/sparse/setupscons.py
 REPLACE_PYTHON+=	scipy/sparse/sparsetools/setup.py
@@ -111,7 +112,7 @@ REPLACE_PYTHON+=	scipy/sparse/sparsetools/setupscons.py
 REPLACE_PYTHON+=	scipy/spatial/setup.py
 REPLACE_PYTHON+=	scipy/spatial/setupscons.py
 REPLACE_PYTHON+=	scipy/spatial/tests/test_distance.py
-REPLACE_PYTHON+=	scipy/special/gendoc.py
+REPLACE_PYTHON+=	scipy/special/generate_ufuncs.py
 REPLACE_PYTHON+=	scipy/special/setup.py
 REPLACE_PYTHON+=	scipy/special/setupscons.py
 REPLACE_PYTHON+=	scipy/special/spfun_stats.py
diff --git a/math/py-scipy/PLIST b/math/py-scipy/PLIST
index dff1a569da6..d490969876b 100644
--- a/math/py-scipy/PLIST
+++ b/math/py-scipy/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2010/06/06 02:37:08 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/04/14 00:28:53 markd Exp $
+${PYSITELIB}/scipy/BENTO_BUILD.txt
+${PYSITELIB}/scipy/HACKING.rst.txt
 ${PYSITELIB}/scipy/INSTALL.txt
 ${PYSITELIB}/scipy/LATEST.txt
 ${PYSITELIB}/scipy/LICENSE.txt
@@ -11,6 +13,12 @@ ${PYSITELIB}/scipy/__config__.pyo
 ${PYSITELIB}/scipy/__init__.py
 ${PYSITELIB}/scipy/__init__.pyc
 ${PYSITELIB}/scipy/__init__.pyo
+${PYSITELIB}/scipy/_build_utils/__init__.py
+${PYSITELIB}/scipy/_build_utils/__init__.pyc
+${PYSITELIB}/scipy/_build_utils/__init__.pyo
+${PYSITELIB}/scipy/_build_utils/_fortran.py
+${PYSITELIB}/scipy/_build_utils/_fortran.pyc
+${PYSITELIB}/scipy/_build_utils/_fortran.pyo
 ${PYSITELIB}/scipy/cluster/__init__.py
 ${PYSITELIB}/scipy/cluster/__init__.pyc
 ${PYSITELIB}/scipy/cluster/__init__.pyo
@@ -19,9 +27,6 @@ ${PYSITELIB}/scipy/cluster/_vq.so
 ${PYSITELIB}/scipy/cluster/hierarchy.py
 ${PYSITELIB}/scipy/cluster/hierarchy.pyc
 ${PYSITELIB}/scipy/cluster/hierarchy.pyo
-${PYSITELIB}/scipy/cluster/info.py
-${PYSITELIB}/scipy/cluster/info.pyc
-${PYSITELIB}/scipy/cluster/info.pyo
 ${PYSITELIB}/scipy/cluster/setup.py
 ${PYSITELIB}/scipy/cluster/setup.pyc
 ${PYSITELIB}/scipy/cluster/setup.pyo
@@ -85,6 +90,8 @@ ${PYSITELIB}/scipy/constants/constants.pyo
 ${PYSITELIB}/scipy/constants/setup.py
 ${PYSITELIB}/scipy/constants/setup.pyc
 ${PYSITELIB}/scipy/constants/setup.pyo
+${PYSITELIB}/scipy/constants/tests/test_codata.py
+${PYSITELIB}/scipy/constants/tests/test_constants.py
 ${PYSITELIB}/scipy/fftpack/__init__.py
 ${PYSITELIB}/scipy/fftpack/__init__.pyc
 ${PYSITELIB}/scipy/fftpack/__init__.pyo
@@ -101,32 +108,40 @@ ${PYSITELIB}/scipy/fftpack/fftpack_version.pyo
 ${PYSITELIB}/scipy/fftpack/helper.py
 ${PYSITELIB}/scipy/fftpack/helper.pyc
 ${PYSITELIB}/scipy/fftpack/helper.pyo
-${PYSITELIB}/scipy/fftpack/info.py
-${PYSITELIB}/scipy/fftpack/info.pyc
-${PYSITELIB}/scipy/fftpack/info.pyo
 ${PYSITELIB}/scipy/fftpack/pseudo_diffs.py
 ${PYSITELIB}/scipy/fftpack/pseudo_diffs.pyc
 ${PYSITELIB}/scipy/fftpack/pseudo_diffs.pyo
+${PYSITELIB}/scipy/fftpack/realtransforms.py
+${PYSITELIB}/scipy/fftpack/realtransforms.pyc
+${PYSITELIB}/scipy/fftpack/realtransforms.pyo
 ${PYSITELIB}/scipy/fftpack/setup.py
 ${PYSITELIB}/scipy/fftpack/setup.pyc
 ${PYSITELIB}/scipy/fftpack/setup.pyo
 ${PYSITELIB}/scipy/fftpack/setupscons.py
 ${PYSITELIB}/scipy/fftpack/setupscons.pyc
 ${PYSITELIB}/scipy/fftpack/setupscons.pyo
+${PYSITELIB}/scipy/fftpack/tests/Makefile
+${PYSITELIB}/scipy/fftpack/tests/fftw_dct.c
+${PYSITELIB}/scipy/fftpack/tests/fftw_double_ref.npz
+${PYSITELIB}/scipy/fftpack/tests/fftw_single_ref.npz
+${PYSITELIB}/scipy/fftpack/tests/gen_fftw_ref.py
+${PYSITELIB}/scipy/fftpack/tests/gendata.m
+${PYSITELIB}/scipy/fftpack/tests/gendata.py
+${PYSITELIB}/scipy/fftpack/tests/test.npz
 ${PYSITELIB}/scipy/fftpack/tests/test_basic.py
 ${PYSITELIB}/scipy/fftpack/tests/test_helper.py
 ${PYSITELIB}/scipy/fftpack/tests/test_pseudo_diffs.py
+${PYSITELIB}/scipy/fftpack/tests/test_real_transforms.py
 ${PYSITELIB}/scipy/integrate/__init__.py
 ${PYSITELIB}/scipy/integrate/__init__.pyc
 ${PYSITELIB}/scipy/integrate/__init__.pyo
+${PYSITELIB}/scipy/integrate/_dop.so
+${PYSITELIB}/scipy/integrate/_ode.py
+${PYSITELIB}/scipy/integrate/_ode.pyc
+${PYSITELIB}/scipy/integrate/_ode.pyo
 ${PYSITELIB}/scipy/integrate/_odepack.so
 ${PYSITELIB}/scipy/integrate/_quadpack.so
-${PYSITELIB}/scipy/integrate/info.py
-${PYSITELIB}/scipy/integrate/info.pyc
-${PYSITELIB}/scipy/integrate/info.pyo
-${PYSITELIB}/scipy/integrate/ode.py
-${PYSITELIB}/scipy/integrate/ode.pyc
-${PYSITELIB}/scipy/integrate/ode.pyo
+${PYSITELIB}/scipy/integrate/lsoda.so
 ${PYSITELIB}/scipy/integrate/odepack.py
 ${PYSITELIB}/scipy/integrate/odepack.pyc
 ${PYSITELIB}/scipy/integrate/odepack.pyo
@@ -158,15 +173,19 @@ ${PYSITELIB}/scipy/interpolate/fitpack.pyo
 ${PYSITELIB}/scipy/interpolate/fitpack2.py
 ${PYSITELIB}/scipy/interpolate/fitpack2.pyc
 ${PYSITELIB}/scipy/interpolate/fitpack2.pyo
-${PYSITELIB}/scipy/interpolate/info.py
-${PYSITELIB}/scipy/interpolate/info.pyc
-${PYSITELIB}/scipy/interpolate/info.pyo
+${PYSITELIB}/scipy/interpolate/interpnd.so
+${PYSITELIB}/scipy/interpolate/interpnd_info.py
+${PYSITELIB}/scipy/interpolate/interpnd_info.pyc
+${PYSITELIB}/scipy/interpolate/interpnd_info.pyo
 ${PYSITELIB}/scipy/interpolate/interpolate.py
 ${PYSITELIB}/scipy/interpolate/interpolate.pyc
 ${PYSITELIB}/scipy/interpolate/interpolate.pyo
 ${PYSITELIB}/scipy/interpolate/interpolate_wrapper.py
 ${PYSITELIB}/scipy/interpolate/interpolate_wrapper.pyc
 ${PYSITELIB}/scipy/interpolate/interpolate_wrapper.pyo
+${PYSITELIB}/scipy/interpolate/ndgriddata.py
+${PYSITELIB}/scipy/interpolate/ndgriddata.pyc
+${PYSITELIB}/scipy/interpolate/ndgriddata.pyo
 ${PYSITELIB}/scipy/interpolate/polyint.py
 ${PYSITELIB}/scipy/interpolate/polyint.pyc
 ${PYSITELIB}/scipy/interpolate/polyint.pyo
@@ -180,10 +199,14 @@ ${PYSITELIB}/scipy/interpolate/setupscons.py
 ${PYSITELIB}/scipy/interpolate/setupscons.pyc
 ${PYSITELIB}/scipy/interpolate/setupscons.pyo
 ${PYSITELIB}/scipy/interpolate/tests/test_fitpack.py
+${PYSITELIB}/scipy/interpolate/tests/test_fitpack2.py
+${PYSITELIB}/scipy/interpolate/tests/test_interpnd.py
 ${PYSITELIB}/scipy/interpolate/tests/test_interpolate.py
 ${PYSITELIB}/scipy/interpolate/tests/test_interpolate_wrapper.py
+${PYSITELIB}/scipy/interpolate/tests/test_ndgriddata.py
 ${PYSITELIB}/scipy/interpolate/tests/test_polyint.py
 ${PYSITELIB}/scipy/interpolate/tests/test_rbf.py
+${PYSITELIB}/scipy/interpolate/tests/test_regression.py
 ${PYSITELIB}/scipy/io/__init__.py
 ${PYSITELIB}/scipy/io/__init__.pyc
 ${PYSITELIB}/scipy/io/__init__.pyo
@@ -199,33 +222,41 @@ ${PYSITELIB}/scipy/io/arff/myfunctools.pyo
 ${PYSITELIB}/scipy/io/arff/setup.py
 ${PYSITELIB}/scipy/io/arff/setup.pyc
 ${PYSITELIB}/scipy/io/arff/setup.pyo
+${PYSITELIB}/scipy/io/arff/tests/data/iris.arff
+${PYSITELIB}/scipy/io/arff/tests/data/missing.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test1.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test2.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test3.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test4.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test5.arff
+${PYSITELIB}/scipy/io/arff/tests/test_arffread.py
 ${PYSITELIB}/scipy/io/arff/utils.py
 ${PYSITELIB}/scipy/io/arff/utils.pyc
 ${PYSITELIB}/scipy/io/arff/utils.pyo
-${PYSITELIB}/scipy/io/array_import.py
-${PYSITELIB}/scipy/io/array_import.pyc
-${PYSITELIB}/scipy/io/array_import.pyo
-${PYSITELIB}/scipy/io/data_store.py
-${PYSITELIB}/scipy/io/data_store.pyc
-${PYSITELIB}/scipy/io/data_store.pyo
-${PYSITELIB}/scipy/io/docs/numpyio.README
-${PYSITELIB}/scipy/io/dumb_shelve.py
-${PYSITELIB}/scipy/io/dumb_shelve.pyc
-${PYSITELIB}/scipy/io/dumb_shelve.pyo
-${PYSITELIB}/scipy/io/dumbdbm_patched.py
-${PYSITELIB}/scipy/io/dumbdbm_patched.pyc
-${PYSITELIB}/scipy/io/dumbdbm_patched.pyo
-${PYSITELIB}/scipy/io/examples/read_array_demo1.py
-${PYSITELIB}/scipy/io/examples/test.txt
-${PYSITELIB}/scipy/io/fopen.py
-${PYSITELIB}/scipy/io/fopen.pyc
-${PYSITELIB}/scipy/io/fopen.pyo
-${PYSITELIB}/scipy/io/info.py
-${PYSITELIB}/scipy/io/info.pyc
-${PYSITELIB}/scipy/io/info.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/__init__.py
+${PYSITELIB}/scipy/io/harwell_boeing/__init__.pyc
+${PYSITELIB}/scipy/io/harwell_boeing/__init__.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/_fortran_format_parser.py
+${PYSITELIB}/scipy/io/harwell_boeing/_fortran_format_parser.pyc
+${PYSITELIB}/scipy/io/harwell_boeing/_fortran_format_parser.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/hb.py
+${PYSITELIB}/scipy/io/harwell_boeing/hb.pyc
+${PYSITELIB}/scipy/io/harwell_boeing/hb.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/setup.py
+${PYSITELIB}/scipy/io/harwell_boeing/setup.pyc
+${PYSITELIB}/scipy/io/harwell_boeing/setup.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/setupscons.py
+${PYSITELIB}/scipy/io/harwell_boeing/setupscons.pyc
+${PYSITELIB}/scipy/io/harwell_boeing/setupscons.pyo
+${PYSITELIB}/scipy/io/harwell_boeing/tests/test_fortran_format.py
+${PYSITELIB}/scipy/io/harwell_boeing/tests/test_hb.py
+${PYSITELIB}/scipy/io/idl.py
+${PYSITELIB}/scipy/io/idl.pyc
+${PYSITELIB}/scipy/io/idl.pyo
 ${PYSITELIB}/scipy/io/matlab/__init__.py
 ${PYSITELIB}/scipy/io/matlab/__init__.pyc
 ${PYSITELIB}/scipy/io/matlab/__init__.pyo
+${PYSITELIB}/scipy/io/matlab/benchmarks/bench_structarr.py
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.py
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.pyc
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.pyo
@@ -238,19 +269,35 @@ ${PYSITELIB}/scipy/io/matlab/mio4.pyo
 ${PYSITELIB}/scipy/io/matlab/mio5.py
 ${PYSITELIB}/scipy/io/matlab/mio5.pyc
 ${PYSITELIB}/scipy/io/matlab/mio5.pyo
+${PYSITELIB}/scipy/io/matlab/mio5_params.py
+${PYSITELIB}/scipy/io/matlab/mio5_params.pyc
+${PYSITELIB}/scipy/io/matlab/mio5_params.pyo
+${PYSITELIB}/scipy/io/matlab/mio5_utils.so
+${PYSITELIB}/scipy/io/matlab/mio_utils.so
 ${PYSITELIB}/scipy/io/matlab/miobase.py
 ${PYSITELIB}/scipy/io/matlab/miobase.pyc
 ${PYSITELIB}/scipy/io/matlab/miobase.pyo
 ${PYSITELIB}/scipy/io/matlab/setup.py
 ${PYSITELIB}/scipy/io/matlab/setup.pyc
 ${PYSITELIB}/scipy/io/matlab/setup.pyo
+${PYSITELIB}/scipy/io/matlab/setupscons.py
+${PYSITELIB}/scipy/io/matlab/setupscons.pyc
+${PYSITELIB}/scipy/io/matlab/setupscons.pyo
+${PYSITELIB}/scipy/io/matlab/streams.so
 ${PYSITELIB}/scipy/io/matlab/tests/afunc.m
 ${PYSITELIB}/scipy/io/matlab/tests/data/japanese_utf8.txt
+${PYSITELIB}/scipy/io/matlab/tests/data/nasty_duplicate_fieldnames.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/one_by_zero_char.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/parabola.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/single_empty_string.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/some_functions.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/sqr.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_7.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test_empty_struct.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/test_mat4_le_floats.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test_skip_variable.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.5.1_GLNX86.mat
@@ -340,46 +387,87 @@ ${PYSITELIB}/scipy/io/matlab/tests/gen_mat5files.m
 ${PYSITELIB}/scipy/io/matlab/tests/save_matfile.m
 ${PYSITELIB}/scipy/io/matlab/tests/test_byteordercodes.py
 ${PYSITELIB}/scipy/io/matlab/tests/test_mio.py
+${PYSITELIB}/scipy/io/matlab/tests/test_mio5_utils.py
+${PYSITELIB}/scipy/io/matlab/tests/test_mio_funcs.py
+${PYSITELIB}/scipy/io/matlab/tests/test_mio_utils.py
+${PYSITELIB}/scipy/io/matlab/tests/test_pathological.py
+${PYSITELIB}/scipy/io/matlab/tests/test_streams.py
 ${PYSITELIB}/scipy/io/mmio.py
 ${PYSITELIB}/scipy/io/mmio.pyc
 ${PYSITELIB}/scipy/io/mmio.pyo
 ${PYSITELIB}/scipy/io/netcdf.py
 ${PYSITELIB}/scipy/io/netcdf.pyc
 ${PYSITELIB}/scipy/io/netcdf.pyo
-${PYSITELIB}/scipy/io/npfile.py
-${PYSITELIB}/scipy/io/npfile.pyc
-${PYSITELIB}/scipy/io/npfile.pyo
-${PYSITELIB}/scipy/io/numpyio.so
-${PYSITELIB}/scipy/io/pickler.py
-${PYSITELIB}/scipy/io/pickler.pyc
-${PYSITELIB}/scipy/io/pickler.pyo
-${PYSITELIB}/scipy/io/recaster.py
-${PYSITELIB}/scipy/io/recaster.pyc
-${PYSITELIB}/scipy/io/recaster.pyo
 ${PYSITELIB}/scipy/io/setup.py
 ${PYSITELIB}/scipy/io/setup.pyc
 ${PYSITELIB}/scipy/io/setup.pyo
 ${PYSITELIB}/scipy/io/setupscons.py
 ${PYSITELIB}/scipy/io/setupscons.pyc
 ${PYSITELIB}/scipy/io/setupscons.pyo
-${PYSITELIB}/scipy/io/tests/test_array_import.py
+${PYSITELIB}/scipy/io/tests/data/array_float32_1d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_2d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_3d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_4d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_5d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_6d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_7d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_8d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_1d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_2d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_3d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_4d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_5d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_6d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_7d.sav
+${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_8d.sav
+${PYSITELIB}/scipy/io/tests/data/example_1.nc
+${PYSITELIB}/scipy/io/tests/data/scalar_byte.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_complex32.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_complex64.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_float32.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_float64.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_heap_pointer.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_int16.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_int32.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_int64.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_string.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_uint16.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_uint32.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_uint64.sav
+${PYSITELIB}/scipy/io/tests/data/struct_arrays.sav
+${PYSITELIB}/scipy/io/tests/data/struct_arrays_replicated.sav
+${PYSITELIB}/scipy/io/tests/data/struct_arrays_replicated_3d.sav
+${PYSITELIB}/scipy/io/tests/data/struct_inherit.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointer_arrays.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointer_arrays_replicated.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointer_arrays_replicated_3d.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointers.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointers_replicated.sav
+${PYSITELIB}/scipy/io/tests/data/struct_pointers_replicated_3d.sav
+${PYSITELIB}/scipy/io/tests/data/struct_scalars.sav
+${PYSITELIB}/scipy/io/tests/data/struct_scalars_replicated.sav
+${PYSITELIB}/scipy/io/tests/data/struct_scalars_replicated_3d.sav
+${PYSITELIB}/scipy/io/tests/data/test-44100-le-1ch-4bytes.wav
+${PYSITELIB}/scipy/io/tests/data/test-8000-le-2ch-1byteu.wav
+${PYSITELIB}/scipy/io/tests/data/various_compressed.sav
+${PYSITELIB}/scipy/io/tests/test_idl.py
 ${PYSITELIB}/scipy/io/tests/test_mmio.py
-${PYSITELIB}/scipy/io/tests/test_npfile.py
-${PYSITELIB}/scipy/io/tests/test_recaster.py
+${PYSITELIB}/scipy/io/tests/test_netcdf.py
+${PYSITELIB}/scipy/io/tests/test_wavfile.py
 ${PYSITELIB}/scipy/io/wavfile.py
 ${PYSITELIB}/scipy/io/wavfile.pyc
 ${PYSITELIB}/scipy/io/wavfile.pyo
 ${PYSITELIB}/scipy/lib/__init__.py
 ${PYSITELIB}/scipy/lib/__init__.pyc
 ${PYSITELIB}/scipy/lib/__init__.pyo
+${PYSITELIB}/scipy/lib/_util.py
+${PYSITELIB}/scipy/lib/_util.pyc
+${PYSITELIB}/scipy/lib/_util.pyo
 ${PYSITELIB}/scipy/lib/blas/__init__.py
 ${PYSITELIB}/scipy/lib/blas/__init__.pyc
 ${PYSITELIB}/scipy/lib/blas/__init__.pyo
 ${PYSITELIB}/scipy/lib/blas/cblas.so
 ${PYSITELIB}/scipy/lib/blas/fblas.so
-${PYSITELIB}/scipy/lib/blas/info.py
-${PYSITELIB}/scipy/lib/blas/info.pyc
-${PYSITELIB}/scipy/lib/blas/info.pyo
 ${PYSITELIB}/scipy/lib/blas/scons_support.py
 ${PYSITELIB}/scipy/lib/blas/scons_support.pyc
 ${PYSITELIB}/scipy/lib/blas/scons_support.pyo
@@ -391,19 +479,15 @@ ${PYSITELIB}/scipy/lib/blas/setupscons.pyc
 ${PYSITELIB}/scipy/lib/blas/setupscons.pyo
 ${PYSITELIB}/scipy/lib/blas/tests/test_blas.py
 ${PYSITELIB}/scipy/lib/blas/tests/test_fblas.py
-${PYSITELIB}/scipy/lib/info.py
-${PYSITELIB}/scipy/lib/info.pyc
-${PYSITELIB}/scipy/lib/info.pyo
+${PYSITELIB}/scipy/lib/decorator.py
+${PYSITELIB}/scipy/lib/decorator.pyc
+${PYSITELIB}/scipy/lib/decorator.pyo
 ${PYSITELIB}/scipy/lib/lapack/__init__.py
 ${PYSITELIB}/scipy/lib/lapack/__init__.pyc
 ${PYSITELIB}/scipy/lib/lapack/__init__.pyo
-${PYSITELIB}/scipy/lib/lapack/atlas_version.so
 ${PYSITELIB}/scipy/lib/lapack/calc_lwork.so
 ${PYSITELIB}/scipy/lib/lapack/clapack.so
 ${PYSITELIB}/scipy/lib/lapack/flapack.so
-${PYSITELIB}/scipy/lib/lapack/info.py
-${PYSITELIB}/scipy/lib/lapack/info.pyc
-${PYSITELIB}/scipy/lib/lapack/info.pyo
 ${PYSITELIB}/scipy/lib/lapack/scons_support.py
 ${PYSITELIB}/scipy/lib/lapack/scons_support.pyc
 ${PYSITELIB}/scipy/lib/lapack/scons_support.pyo
@@ -423,11 +507,24 @@ ${PYSITELIB}/scipy/lib/setup.pyo
 ${PYSITELIB}/scipy/lib/setupscons.py
 ${PYSITELIB}/scipy/lib/setupscons.pyc
 ${PYSITELIB}/scipy/lib/setupscons.pyo
+${PYSITELIB}/scipy/lib/six.py
+${PYSITELIB}/scipy/lib/six.pyc
+${PYSITELIB}/scipy/lib/six.pyo
 ${PYSITELIB}/scipy/linalg/__init__.py
 ${PYSITELIB}/scipy/linalg/__init__.pyc
 ${PYSITELIB}/scipy/linalg/__init__.pyo
+${PYSITELIB}/scipy/linalg/_decomp_qz.py
+${PYSITELIB}/scipy/linalg/_decomp_qz.pyc
+${PYSITELIB}/scipy/linalg/_decomp_qz.pyo
+${PYSITELIB}/scipy/linalg/_fblas.so
+${PYSITELIB}/scipy/linalg/_flapack.so
 ${PYSITELIB}/scipy/linalg/_flinalg.so
-${PYSITELIB}/scipy/linalg/atlas_version.so
+${PYSITELIB}/scipy/linalg/_solvers.py
+${PYSITELIB}/scipy/linalg/_solvers.pyc
+${PYSITELIB}/scipy/linalg/_solvers.pyo
+${PYSITELIB}/scipy/linalg/_testutils.py
+${PYSITELIB}/scipy/linalg/_testutils.pyc
+${PYSITELIB}/scipy/linalg/_testutils.pyo
 ${PYSITELIB}/scipy/linalg/basic.py
 ${PYSITELIB}/scipy/linalg/basic.pyc
 ${PYSITELIB}/scipy/linalg/basic.pyo
@@ -437,25 +534,39 @@ ${PYSITELIB}/scipy/linalg/blas.py
 ${PYSITELIB}/scipy/linalg/blas.pyc
 ${PYSITELIB}/scipy/linalg/blas.pyo
 ${PYSITELIB}/scipy/linalg/calc_lwork.so
-${PYSITELIB}/scipy/linalg/cblas.so
-${PYSITELIB}/scipy/linalg/clapack.so
+${PYSITELIB}/scipy/linalg/cblas.py
+${PYSITELIB}/scipy/linalg/cblas.pyc
+${PYSITELIB}/scipy/linalg/cblas.pyo
+${PYSITELIB}/scipy/linalg/clapack.py
+${PYSITELIB}/scipy/linalg/clapack.pyc
+${PYSITELIB}/scipy/linalg/clapack.pyo
 ${PYSITELIB}/scipy/linalg/decomp.py
 ${PYSITELIB}/scipy/linalg/decomp.pyc
 ${PYSITELIB}/scipy/linalg/decomp.pyo
-${PYSITELIB}/scipy/linalg/fblas.so
-${PYSITELIB}/scipy/linalg/flapack.so
+${PYSITELIB}/scipy/linalg/decomp_cholesky.py
+${PYSITELIB}/scipy/linalg/decomp_cholesky.pyc
+${PYSITELIB}/scipy/linalg/decomp_cholesky.pyo
+${PYSITELIB}/scipy/linalg/decomp_lu.py
+${PYSITELIB}/scipy/linalg/decomp_lu.pyc
+${PYSITELIB}/scipy/linalg/decomp_lu.pyo
+${PYSITELIB}/scipy/linalg/decomp_qr.py
+${PYSITELIB}/scipy/linalg/decomp_qr.pyc
+${PYSITELIB}/scipy/linalg/decomp_qr.pyo
+${PYSITELIB}/scipy/linalg/decomp_schur.py
+${PYSITELIB}/scipy/linalg/decomp_schur.pyc
+${PYSITELIB}/scipy/linalg/decomp_schur.pyo
+${PYSITELIB}/scipy/linalg/decomp_svd.py
+${PYSITELIB}/scipy/linalg/decomp_svd.pyc
+${PYSITELIB}/scipy/linalg/decomp_svd.pyo
+${PYSITELIB}/scipy/linalg/fblas.py
+${PYSITELIB}/scipy/linalg/fblas.pyc
+${PYSITELIB}/scipy/linalg/fblas.pyo
+${PYSITELIB}/scipy/linalg/flapack.py
+${PYSITELIB}/scipy/linalg/flapack.pyc
+${PYSITELIB}/scipy/linalg/flapack.pyo
 ${PYSITELIB}/scipy/linalg/flinalg.py
 ${PYSITELIB}/scipy/linalg/flinalg.pyc
 ${PYSITELIB}/scipy/linalg/flinalg.pyo
-${PYSITELIB}/scipy/linalg/info.py
-${PYSITELIB}/scipy/linalg/info.pyc
-${PYSITELIB}/scipy/linalg/info.pyo
-${PYSITELIB}/scipy/linalg/interface_gen.py
-${PYSITELIB}/scipy/linalg/interface_gen.pyc
-${PYSITELIB}/scipy/linalg/interface_gen.pyo
-${PYSITELIB}/scipy/linalg/iterative.py
-${PYSITELIB}/scipy/linalg/iterative.pyc
-${PYSITELIB}/scipy/linalg/iterative.pyo
 ${PYSITELIB}/scipy/linalg/lapack.py
 ${PYSITELIB}/scipy/linalg/lapack.pyc
 ${PYSITELIB}/scipy/linalg/lapack.pyo
@@ -465,77 +576,43 @@ ${PYSITELIB}/scipy/linalg/linalg_version.pyo
 ${PYSITELIB}/scipy/linalg/matfuncs.py
 ${PYSITELIB}/scipy/linalg/matfuncs.pyc
 ${PYSITELIB}/scipy/linalg/matfuncs.pyo
-${PYSITELIB}/scipy/linalg/scons_support.py
-${PYSITELIB}/scipy/linalg/scons_support.pyc
-${PYSITELIB}/scipy/linalg/scons_support.pyo
+${PYSITELIB}/scipy/linalg/misc.py
+${PYSITELIB}/scipy/linalg/misc.pyc
+${PYSITELIB}/scipy/linalg/misc.pyo
 ${PYSITELIB}/scipy/linalg/setup.py
 ${PYSITELIB}/scipy/linalg/setup.pyc
 ${PYSITELIB}/scipy/linalg/setup.pyo
-${PYSITELIB}/scipy/linalg/setup_atlas_version.py
-${PYSITELIB}/scipy/linalg/setup_atlas_version.pyc
-${PYSITELIB}/scipy/linalg/setup_atlas_version.pyo
 ${PYSITELIB}/scipy/linalg/setupscons.py
 ${PYSITELIB}/scipy/linalg/setupscons.pyc
 ${PYSITELIB}/scipy/linalg/setupscons.pyo
-${PYSITELIB}/scipy/linalg/tests/test_atlas_version.py
+${PYSITELIB}/scipy/linalg/special_matrices.py
+${PYSITELIB}/scipy/linalg/special_matrices.pyc
+${PYSITELIB}/scipy/linalg/special_matrices.pyo
 ${PYSITELIB}/scipy/linalg/tests/test_basic.py
 ${PYSITELIB}/scipy/linalg/tests/test_blas.py
 ${PYSITELIB}/scipy/linalg/tests/test_build.py
 ${PYSITELIB}/scipy/linalg/tests/test_decomp.py
+${PYSITELIB}/scipy/linalg/tests/test_decomp_cholesky.py
 ${PYSITELIB}/scipy/linalg/tests/test_fblas.py
 ${PYSITELIB}/scipy/linalg/tests/test_lapack.py
 ${PYSITELIB}/scipy/linalg/tests/test_matfuncs.py
-${PYSITELIB}/scipy/linsolve/__init__.py
-${PYSITELIB}/scipy/linsolve/__init__.pyc
-${PYSITELIB}/scipy/linsolve/__init__.pyo
-${PYSITELIB}/scipy/maxentropy/__init__.py
-${PYSITELIB}/scipy/maxentropy/__init__.pyc
-${PYSITELIB}/scipy/maxentropy/__init__.pyo
-${PYSITELIB}/scipy/maxentropy/examples/bergerexample.py
-${PYSITELIB}/scipy/maxentropy/examples/bergerexamplesimulated.py
-${PYSITELIB}/scipy/maxentropy/examples/conditionalexample1.py
-${PYSITELIB}/scipy/maxentropy/examples/conditionalexample2.py
-${PYSITELIB}/scipy/maxentropy/info.py
-${PYSITELIB}/scipy/maxentropy/info.pyc
-${PYSITELIB}/scipy/maxentropy/info.pyo
-${PYSITELIB}/scipy/maxentropy/maxentropy.py
-${PYSITELIB}/scipy/maxentropy/maxentropy.pyc
-${PYSITELIB}/scipy/maxentropy/maxentropy.pyo
-${PYSITELIB}/scipy/maxentropy/maxentutils.py
-${PYSITELIB}/scipy/maxentropy/maxentutils.pyc
-${PYSITELIB}/scipy/maxentropy/maxentutils.pyo
-${PYSITELIB}/scipy/maxentropy/setup.py
-${PYSITELIB}/scipy/maxentropy/setup.pyc
-${PYSITELIB}/scipy/maxentropy/setup.pyo
-${PYSITELIB}/scipy/maxentropy/setupscons.py
-${PYSITELIB}/scipy/maxentropy/setupscons.pyc
-${PYSITELIB}/scipy/maxentropy/setupscons.pyo
-${PYSITELIB}/scipy/maxentropy/tests/test_maxentropy.py
+${PYSITELIB}/scipy/linalg/tests/test_solvers.py
+${PYSITELIB}/scipy/linalg/tests/test_special_matrices.py
 ${PYSITELIB}/scipy/misc/__init__.py
 ${PYSITELIB}/scipy/misc/__init__.pyc
 ${PYSITELIB}/scipy/misc/__init__.pyo
+${PYSITELIB}/scipy/misc/ascent.dat
 ${PYSITELIB}/scipy/misc/common.py
 ${PYSITELIB}/scipy/misc/common.pyc
 ${PYSITELIB}/scipy/misc/common.pyo
-${PYSITELIB}/scipy/misc/helpmod.py
-${PYSITELIB}/scipy/misc/helpmod.pyc
-${PYSITELIB}/scipy/misc/helpmod.pyo
-${PYSITELIB}/scipy/misc/info.py
-${PYSITELIB}/scipy/misc/info.pyc
-${PYSITELIB}/scipy/misc/info.pyo
+${PYSITELIB}/scipy/misc/doccer.py
+${PYSITELIB}/scipy/misc/doccer.pyc
+${PYSITELIB}/scipy/misc/doccer.pyo
+${PYSITELIB}/scipy/misc/face.dat
 ${PYSITELIB}/scipy/misc/lena.dat
-${PYSITELIB}/scipy/misc/limits.py
-${PYSITELIB}/scipy/misc/limits.pyc
-${PYSITELIB}/scipy/misc/limits.pyo
-${PYSITELIB}/scipy/misc/pexec.py
-${PYSITELIB}/scipy/misc/pexec.pyc
-${PYSITELIB}/scipy/misc/pexec.pyo
 ${PYSITELIB}/scipy/misc/pilutil.py
 ${PYSITELIB}/scipy/misc/pilutil.pyc
 ${PYSITELIB}/scipy/misc/pilutil.pyo
-${PYSITELIB}/scipy/misc/ppimport.py
-${PYSITELIB}/scipy/misc/ppimport.pyc
-${PYSITELIB}/scipy/misc/ppimport.pyo
 ${PYSITELIB}/scipy/misc/setup.py
 ${PYSITELIB}/scipy/misc/setup.pyc
 ${PYSITELIB}/scipy/misc/setup.pyo
@@ -545,6 +622,8 @@ ${PYSITELIB}/scipy/misc/setupscons.pyo
 ${PYSITELIB}/scipy/misc/tests/data/icon.png
 ${PYSITELIB}/scipy/misc/tests/data/icon_mono.png
 ${PYSITELIB}/scipy/misc/tests/data/icon_mono_flat.png
+${PYSITELIB}/scipy/misc/tests/test_common.py
+${PYSITELIB}/scipy/misc/tests/test_doccer.py
 ${PYSITELIB}/scipy/misc/tests/test_pilutil.py
 ${PYSITELIB}/scipy/ndimage/__init__.py
 ${PYSITELIB}/scipy/ndimage/__init__.pyc
@@ -553,21 +632,18 @@ ${PYSITELIB}/scipy/ndimage/_nd_image.so
 ${PYSITELIB}/scipy/ndimage/_ni_support.py
 ${PYSITELIB}/scipy/ndimage/_ni_support.pyc
 ${PYSITELIB}/scipy/ndimage/_ni_support.pyo
-${PYSITELIB}/scipy/ndimage/doccer.py
-${PYSITELIB}/scipy/ndimage/doccer.pyc
-${PYSITELIB}/scipy/ndimage/doccer.pyo
 ${PYSITELIB}/scipy/ndimage/filters.py
 ${PYSITELIB}/scipy/ndimage/filters.pyc
 ${PYSITELIB}/scipy/ndimage/filters.pyo
 ${PYSITELIB}/scipy/ndimage/fourier.py
 ${PYSITELIB}/scipy/ndimage/fourier.pyc
 ${PYSITELIB}/scipy/ndimage/fourier.pyo
-${PYSITELIB}/scipy/ndimage/info.py
-${PYSITELIB}/scipy/ndimage/info.pyc
-${PYSITELIB}/scipy/ndimage/info.pyo
 ${PYSITELIB}/scipy/ndimage/interpolation.py
 ${PYSITELIB}/scipy/ndimage/interpolation.pyc
 ${PYSITELIB}/scipy/ndimage/interpolation.pyo
+${PYSITELIB}/scipy/ndimage/io.py
+${PYSITELIB}/scipy/ndimage/io.pyc
+${PYSITELIB}/scipy/ndimage/io.pyo
 ${PYSITELIB}/scipy/ndimage/measurements.py
 ${PYSITELIB}/scipy/ndimage/measurements.pyc
 ${PYSITELIB}/scipy/ndimage/measurements.pyo
@@ -580,18 +656,17 @@ ${PYSITELIB}/scipy/ndimage/setup.pyo
 ${PYSITELIB}/scipy/ndimage/setupscons.py
 ${PYSITELIB}/scipy/ndimage/setupscons.pyc
 ${PYSITELIB}/scipy/ndimage/setupscons.pyo
-${PYSITELIB}/scipy/ndimage/tests/slice112.raw
-${PYSITELIB}/scipy/ndimage/tests/test_doccer.py
+${PYSITELIB}/scipy/ndimage/tests/dots.png
+${PYSITELIB}/scipy/ndimage/tests/test_datatypes.py
 ${PYSITELIB}/scipy/ndimage/tests/test_filters.py
+${PYSITELIB}/scipy/ndimage/tests/test_io.py
+${PYSITELIB}/scipy/ndimage/tests/test_measurements.py
 ${PYSITELIB}/scipy/ndimage/tests/test_ndimage.py
 ${PYSITELIB}/scipy/ndimage/tests/test_regression.py
 ${PYSITELIB}/scipy/odr/__init__.py
 ${PYSITELIB}/scipy/odr/__init__.pyc
 ${PYSITELIB}/scipy/odr/__init__.pyo
 ${PYSITELIB}/scipy/odr/__odrpack.so
-${PYSITELIB}/scipy/odr/info.py
-${PYSITELIB}/scipy/odr/info.pyc
-${PYSITELIB}/scipy/odr/info.pyo
 ${PYSITELIB}/scipy/odr/models.py
 ${PYSITELIB}/scipy/odr/models.pyc
 ${PYSITELIB}/scipy/odr/models.pyo
@@ -608,10 +683,19 @@ ${PYSITELIB}/scipy/odr/tests/test_odr.py
 ${PYSITELIB}/scipy/optimize/__init__.py
 ${PYSITELIB}/scipy/optimize/__init__.pyc
 ${PYSITELIB}/scipy/optimize/__init__.pyo
+${PYSITELIB}/scipy/optimize/_basinhopping.py
+${PYSITELIB}/scipy/optimize/_basinhopping.pyc
+${PYSITELIB}/scipy/optimize/_basinhopping.pyo
 ${PYSITELIB}/scipy/optimize/_cobyla.so
 ${PYSITELIB}/scipy/optimize/_lbfgsb.so
+${PYSITELIB}/scipy/optimize/_minimize.py
+${PYSITELIB}/scipy/optimize/_minimize.pyc
+${PYSITELIB}/scipy/optimize/_minimize.pyo
 ${PYSITELIB}/scipy/optimize/_minpack.so
 ${PYSITELIB}/scipy/optimize/_nnls.so
+${PYSITELIB}/scipy/optimize/_root.py
+${PYSITELIB}/scipy/optimize/_root.pyc
+${PYSITELIB}/scipy/optimize/_root.pyo
 ${PYSITELIB}/scipy/optimize/_slsqp.so
 ${PYSITELIB}/scipy/optimize/_tstutils.py
 ${PYSITELIB}/scipy/optimize/_tstutils.pyc
@@ -624,9 +708,6 @@ ${PYSITELIB}/scipy/optimize/benchmarks/bench_zeros.py
 ${PYSITELIB}/scipy/optimize/cobyla.py
 ${PYSITELIB}/scipy/optimize/cobyla.pyc
 ${PYSITELIB}/scipy/optimize/cobyla.pyo
-${PYSITELIB}/scipy/optimize/info.py
-${PYSITELIB}/scipy/optimize/info.pyc
-${PYSITELIB}/scipy/optimize/info.pyo
 ${PYSITELIB}/scipy/optimize/lbfgsb.py
 ${PYSITELIB}/scipy/optimize/lbfgsb.pyc
 ${PYSITELIB}/scipy/optimize/lbfgsb.pyo
@@ -656,10 +737,16 @@ ${PYSITELIB}/scipy/optimize/setupscons.pyo
 ${PYSITELIB}/scipy/optimize/slsqp.py
 ${PYSITELIB}/scipy/optimize/slsqp.pyc
 ${PYSITELIB}/scipy/optimize/slsqp.pyo
+${PYSITELIB}/scipy/optimize/tests/test__basinhopping.py
+${PYSITELIB}/scipy/optimize/tests/test__root.py
+${PYSITELIB}/scipy/optimize/tests/test_anneal.py
 ${PYSITELIB}/scipy/optimize/tests/test_cobyla.py
+${PYSITELIB}/scipy/optimize/tests/test_linesearch.py
+${PYSITELIB}/scipy/optimize/tests/test_minpack.py
 ${PYSITELIB}/scipy/optimize/tests/test_nnls.py
 ${PYSITELIB}/scipy/optimize/tests/test_nonlin.py
 ${PYSITELIB}/scipy/optimize/tests/test_optimize.py
+${PYSITELIB}/scipy/optimize/tests/test_regression.py
 ${PYSITELIB}/scipy/optimize/tests/test_slsqp.py
 ${PYSITELIB}/scipy/optimize/tests/test_zeros.py
 ${PYSITELIB}/scipy/optimize/tnc.py
@@ -677,15 +764,28 @@ ${PYSITELIB}/scipy/setupscons.pyo
 ${PYSITELIB}/scipy/signal/__init__.py
 ${PYSITELIB}/scipy/signal/__init__.pyc
 ${PYSITELIB}/scipy/signal/__init__.pyo
+${PYSITELIB}/scipy/signal/_arraytools.py
+${PYSITELIB}/scipy/signal/_arraytools.pyc
+${PYSITELIB}/scipy/signal/_arraytools.pyo
+${PYSITELIB}/scipy/signal/_peak_finding.py
+${PYSITELIB}/scipy/signal/_peak_finding.pyc
+${PYSITELIB}/scipy/signal/_peak_finding.pyo
+${PYSITELIB}/scipy/signal/_spectral.so
 ${PYSITELIB}/scipy/signal/bsplines.py
 ${PYSITELIB}/scipy/signal/bsplines.pyc
 ${PYSITELIB}/scipy/signal/bsplines.pyo
+${PYSITELIB}/scipy/signal/cont2discrete.py
+${PYSITELIB}/scipy/signal/cont2discrete.pyc
+${PYSITELIB}/scipy/signal/cont2discrete.pyo
+${PYSITELIB}/scipy/signal/dltisys.py
+${PYSITELIB}/scipy/signal/dltisys.pyc
+${PYSITELIB}/scipy/signal/dltisys.pyo
 ${PYSITELIB}/scipy/signal/filter_design.py
 ${PYSITELIB}/scipy/signal/filter_design.pyc
 ${PYSITELIB}/scipy/signal/filter_design.pyo
-${PYSITELIB}/scipy/signal/info.py
-${PYSITELIB}/scipy/signal/info.pyc
-${PYSITELIB}/scipy/signal/info.pyo
+${PYSITELIB}/scipy/signal/fir_filter_design.py
+${PYSITELIB}/scipy/signal/fir_filter_design.pyc
+${PYSITELIB}/scipy/signal/fir_filter_design.pyo
 ${PYSITELIB}/scipy/signal/ltisys.py
 ${PYSITELIB}/scipy/signal/ltisys.pyc
 ${PYSITELIB}/scipy/signal/ltisys.pyo
@@ -699,17 +799,31 @@ ${PYSITELIB}/scipy/signal/signaltools.py
 ${PYSITELIB}/scipy/signal/signaltools.pyc
 ${PYSITELIB}/scipy/signal/signaltools.pyo
 ${PYSITELIB}/scipy/signal/sigtools.so
+${PYSITELIB}/scipy/signal/spectral.py
+${PYSITELIB}/scipy/signal/spectral.pyc
+${PYSITELIB}/scipy/signal/spectral.pyo
 ${PYSITELIB}/scipy/signal/spline.so
+${PYSITELIB}/scipy/signal/tests/test_array_tools.py
+${PYSITELIB}/scipy/signal/tests/test_cont2discrete.py
+${PYSITELIB}/scipy/signal/tests/test_dltisys.py
 ${PYSITELIB}/scipy/signal/tests/test_filter_design.py
+${PYSITELIB}/scipy/signal/tests/test_fir_filter_design.py
+${PYSITELIB}/scipy/signal/tests/test_ltisys.py
+${PYSITELIB}/scipy/signal/tests/test_peak_finding.py
 ${PYSITELIB}/scipy/signal/tests/test_signaltools.py
+${PYSITELIB}/scipy/signal/tests/test_spectral.py
 ${PYSITELIB}/scipy/signal/tests/test_waveforms.py
 ${PYSITELIB}/scipy/signal/tests/test_wavelets.py
+${PYSITELIB}/scipy/signal/tests/test_windows.py
 ${PYSITELIB}/scipy/signal/waveforms.py
 ${PYSITELIB}/scipy/signal/waveforms.pyc
 ${PYSITELIB}/scipy/signal/waveforms.pyo
 ${PYSITELIB}/scipy/signal/wavelets.py
 ${PYSITELIB}/scipy/signal/wavelets.pyc
 ${PYSITELIB}/scipy/signal/wavelets.pyo
+${PYSITELIB}/scipy/signal/windows.py
+${PYSITELIB}/scipy/signal/windows.pyc
+${PYSITELIB}/scipy/signal/windows.pyo
 ${PYSITELIB}/scipy/sparse/__init__.py
 ${PYSITELIB}/scipy/sparse/__init__.pyc
 ${PYSITELIB}/scipy/sparse/__init__.pyo
@@ -732,6 +846,35 @@ ${PYSITELIB}/scipy/sparse/coo.pyo
 ${PYSITELIB}/scipy/sparse/csc.py
 ${PYSITELIB}/scipy/sparse/csc.pyc
 ${PYSITELIB}/scipy/sparse/csc.pyo
+${PYSITELIB}/scipy/sparse/csgraph/__init__.py
+${PYSITELIB}/scipy/sparse/csgraph/__init__.pyc
+${PYSITELIB}/scipy/sparse/csgraph/__init__.pyo
+${PYSITELIB}/scipy/sparse/csgraph/_components.py
+${PYSITELIB}/scipy/sparse/csgraph/_components.pyc
+${PYSITELIB}/scipy/sparse/csgraph/_components.pyo
+${PYSITELIB}/scipy/sparse/csgraph/_laplacian.py
+${PYSITELIB}/scipy/sparse/csgraph/_laplacian.pyc
+${PYSITELIB}/scipy/sparse/csgraph/_laplacian.pyo
+${PYSITELIB}/scipy/sparse/csgraph/_min_spanning_tree.so
+${PYSITELIB}/scipy/sparse/csgraph/_shortest_path.so
+${PYSITELIB}/scipy/sparse/csgraph/_tools.so
+${PYSITELIB}/scipy/sparse/csgraph/_traversal.so
+${PYSITELIB}/scipy/sparse/csgraph/_validation.py
+${PYSITELIB}/scipy/sparse/csgraph/_validation.pyc
+${PYSITELIB}/scipy/sparse/csgraph/_validation.pyo
+${PYSITELIB}/scipy/sparse/csgraph/setup.py
+${PYSITELIB}/scipy/sparse/csgraph/setup.pyc
+${PYSITELIB}/scipy/sparse/csgraph/setup.pyo
+${PYSITELIB}/scipy/sparse/csgraph/setupscons.py
+${PYSITELIB}/scipy/sparse/csgraph/setupscons.pyc
+${PYSITELIB}/scipy/sparse/csgraph/setupscons.pyo
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_connected_components.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_conversions.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_graph_components.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_graph_laplacian.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_shortest_path.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_spanning_tree.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_traversal.py
 ${PYSITELIB}/scipy/sparse/csr.py
 ${PYSITELIB}/scipy/sparse/csr.pyc
 ${PYSITELIB}/scipy/sparse/csr.pyo
@@ -747,9 +890,6 @@ ${PYSITELIB}/scipy/sparse/dok.pyo
 ${PYSITELIB}/scipy/sparse/extract.py
 ${PYSITELIB}/scipy/sparse/extract.pyc
 ${PYSITELIB}/scipy/sparse/extract.pyo
-${PYSITELIB}/scipy/sparse/info.py
-${PYSITELIB}/scipy/sparse/info.pyc
-${PYSITELIB}/scipy/sparse/info.pyo
 ${PYSITELIB}/scipy/sparse/lil.py
 ${PYSITELIB}/scipy/sparse/lil.pyc
 ${PYSITELIB}/scipy/sparse/lil.pyo
@@ -759,16 +899,7 @@ ${PYSITELIB}/scipy/sparse/linalg/__init__.pyo
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.py
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.pyc
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_csuperlu.so
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_dsuperlu.so
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_ssuperlu.so
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_superlu.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_superlu.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_superlu.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/_zsuperlu.so
-${PYSITELIB}/scipy/sparse/linalg/dsolve/info.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/info.pyo
+${PYSITELIB}/scipy/sparse/linalg/dsolve/_superlu.so
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.py
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.pyc
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.pyo
@@ -782,9 +913,6 @@ ${PYSITELIB}/scipy/sparse/linalg/dsolve/tests/test_linsolve.py
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.py
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.pyc
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/info.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/info.pyo
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.py
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.pyc
 ${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.pyo
@@ -806,29 +934,16 @@ ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/_arpack.so
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/arpack.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/arpack.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/arpack.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/info.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/info.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/speigs.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/speigs.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/speigs.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/info.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/info.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/info.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/info.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.pyo
@@ -847,9 +962,6 @@ ${PYSITELIB}/scipy/sparse/linalg/eigen/setup.pyo
 ${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.py
 ${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.pyc
 ${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.pyo
-${PYSITELIB}/scipy/sparse/linalg/info.py
-${PYSITELIB}/scipy/sparse/linalg/info.pyc
-${PYSITELIB}/scipy/sparse/linalg/info.pyo
 ${PYSITELIB}/scipy/sparse/linalg/interface.py
 ${PYSITELIB}/scipy/sparse/linalg/interface.pyc
 ${PYSITELIB}/scipy/sparse/linalg/interface.pyo
@@ -860,6 +972,15 @@ ${PYSITELIB}/scipy/sparse/linalg/isolve/_iterative.so
 ${PYSITELIB}/scipy/sparse/linalg/isolve/iterative.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/iterative.pyc
 ${PYSITELIB}/scipy/sparse/linalg/isolve/iterative.pyo
+${PYSITELIB}/scipy/sparse/linalg/isolve/lgmres.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/lgmres.pyc
+${PYSITELIB}/scipy/sparse/linalg/isolve/lgmres.pyo
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsmr.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsmr.pyc
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsmr.pyo
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsqr.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsqr.pyc
+${PYSITELIB}/scipy/sparse/linalg/isolve/lsqr.pyo
 ${PYSITELIB}/scipy/sparse/linalg/isolve/minres.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/minres.pyc
 ${PYSITELIB}/scipy/sparse/linalg/isolve/minres.pyo
@@ -869,10 +990,18 @@ ${PYSITELIB}/scipy/sparse/linalg/isolve/setup.pyo
 ${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.pyc
 ${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.pyo
+${PYSITELIB}/scipy/sparse/linalg/isolve/tests/demo_lgmres.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_iterative.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_lgmres.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_lsmr.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_lsqr.py
+${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_utils.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/utils.py
 ${PYSITELIB}/scipy/sparse/linalg/isolve/utils.pyc
 ${PYSITELIB}/scipy/sparse/linalg/isolve/utils.pyo
+${PYSITELIB}/scipy/sparse/linalg/matfuncs.py
+${PYSITELIB}/scipy/sparse/linalg/matfuncs.pyc
+${PYSITELIB}/scipy/sparse/linalg/matfuncs.pyo
 ${PYSITELIB}/scipy/sparse/linalg/setup.py
 ${PYSITELIB}/scipy/sparse/linalg/setup.pyc
 ${PYSITELIB}/scipy/sparse/linalg/setup.pyo
@@ -880,6 +1009,7 @@ ${PYSITELIB}/scipy/sparse/linalg/setupscons.py
 ${PYSITELIB}/scipy/sparse/linalg/setupscons.pyc
 ${PYSITELIB}/scipy/sparse/linalg/setupscons.pyo
 ${PYSITELIB}/scipy/sparse/linalg/tests/test_interface.py
+${PYSITELIB}/scipy/sparse/linalg/tests/test_matfuncs.py
 ${PYSITELIB}/scipy/sparse/setup.py
 ${PYSITELIB}/scipy/sparse/setup.pyc
 ${PYSITELIB}/scipy/sparse/setup.pyo
@@ -892,6 +1022,7 @@ ${PYSITELIB}/scipy/sparse/sparsetools/__init__.pyo
 ${PYSITELIB}/scipy/sparse/sparsetools/_bsr.so
 ${PYSITELIB}/scipy/sparse/sparsetools/_coo.so
 ${PYSITELIB}/scipy/sparse/sparsetools/_csc.so
+${PYSITELIB}/scipy/sparse/sparsetools/_csgraph.so
 ${PYSITELIB}/scipy/sparse/sparsetools/_csr.so
 ${PYSITELIB}/scipy/sparse/sparsetools/_dia.so
 ${PYSITELIB}/scipy/sparse/sparsetools/bsr.py
@@ -903,6 +1034,9 @@ ${PYSITELIB}/scipy/sparse/sparsetools/coo.pyo
 ${PYSITELIB}/scipy/sparse/sparsetools/csc.py
 ${PYSITELIB}/scipy/sparse/sparsetools/csc.pyc
 ${PYSITELIB}/scipy/sparse/sparsetools/csc.pyo
+${PYSITELIB}/scipy/sparse/sparsetools/csgraph.py
+${PYSITELIB}/scipy/sparse/sparsetools/csgraph.pyc
+${PYSITELIB}/scipy/sparse/sparsetools/csgraph.pyo
 ${PYSITELIB}/scipy/sparse/sparsetools/csr.py
 ${PYSITELIB}/scipy/sparse/sparsetools/csr.pyc
 ${PYSITELIB}/scipy/sparse/sparsetools/csr.pyo
@@ -923,6 +1057,8 @@ ${PYSITELIB}/scipy/sparse/sputils.pyc
 ${PYSITELIB}/scipy/sparse/sputils.pyo
 ${PYSITELIB}/scipy/sparse/tests/test_base.py
 ${PYSITELIB}/scipy/sparse/tests/test_construct.py
+${PYSITELIB}/scipy/sparse/tests/test_csc.py
+${PYSITELIB}/scipy/sparse/tests/test_csr.py
 ${PYSITELIB}/scipy/sparse/tests/test_extract.py
 ${PYSITELIB}/scipy/sparse/tests/test_spfuncs.py
 ${PYSITELIB}/scipy/sparse/tests/test_sputils.py
@@ -930,61 +1066,73 @@ ${PYSITELIB}/scipy/spatial/__init__.py
 ${PYSITELIB}/scipy/spatial/__init__.pyc
 ${PYSITELIB}/scipy/spatial/__init__.pyo
 ${PYSITELIB}/scipy/spatial/_distance_wrap.so
+${PYSITELIB}/scipy/spatial/_plotutils.py
+${PYSITELIB}/scipy/spatial/_plotutils.pyc
+${PYSITELIB}/scipy/spatial/_plotutils.pyo
+${PYSITELIB}/scipy/spatial/benchmarks/bench_ckdtree.py
 ${PYSITELIB}/scipy/spatial/ckdtree.so
 ${PYSITELIB}/scipy/spatial/distance.py
 ${PYSITELIB}/scipy/spatial/distance.pyc
 ${PYSITELIB}/scipy/spatial/distance.pyo
-${PYSITELIB}/scipy/spatial/info.py
-${PYSITELIB}/scipy/spatial/info.pyc
-${PYSITELIB}/scipy/spatial/info.pyo
 ${PYSITELIB}/scipy/spatial/kdtree.py
 ${PYSITELIB}/scipy/spatial/kdtree.pyc
 ${PYSITELIB}/scipy/spatial/kdtree.pyo
+${PYSITELIB}/scipy/spatial/qhull.so
 ${PYSITELIB}/scipy/spatial/setup.py
 ${PYSITELIB}/scipy/spatial/setup.pyc
 ${PYSITELIB}/scipy/spatial/setup.pyo
 ${PYSITELIB}/scipy/spatial/setupscons.py
 ${PYSITELIB}/scipy/spatial/setupscons.pyc
 ${PYSITELIB}/scipy/spatial/setupscons.pyo
-${PYSITELIB}/scipy/spatial/tests/cdist-X1.txt
-${PYSITELIB}/scipy/spatial/tests/cdist-X2.txt
-${PYSITELIB}/scipy/spatial/tests/iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-boolean-inp.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-chebychev-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-chebychev-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-cityblock-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-cityblock-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-correlation-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-correlation-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-cosine-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-cosine-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-double-inp.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-euclidean-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-euclidean-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-hamming-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-jaccard-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-minkowski-3.2-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-minkowski-3.2-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-minkowski-5.8-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-seuclidean-ml-iris.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-seuclidean-ml.txt
-${PYSITELIB}/scipy/spatial/tests/pdist-spearman-ml.txt
-${PYSITELIB}/scipy/spatial/tests/random-bool-data.txt
+${PYSITELIB}/scipy/spatial/tests/data/cdist-X1.txt
+${PYSITELIB}/scipy/spatial/tests/data/cdist-X2.txt
+${PYSITELIB}/scipy/spatial/tests/data/degenerate_pointset.npz
+${PYSITELIB}/scipy/spatial/tests/data/iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-boolean-inp.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-chebychev-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-chebychev-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-cityblock-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-cityblock-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-correlation-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-correlation-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-cosine-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-cosine-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-double-inp.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-euclidean-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-euclidean-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-hamming-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-jaccard-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-minkowski-3.2-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-minkowski-3.2-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-minkowski-5.8-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-seuclidean-ml-iris.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-seuclidean-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/pdist-spearman-ml.txt
+${PYSITELIB}/scipy/spatial/tests/data/random-bool-data.txt
+${PYSITELIB}/scipy/spatial/tests/test__plotutils.py
 ${PYSITELIB}/scipy/spatial/tests/test_distance.py
 ${PYSITELIB}/scipy/spatial/tests/test_kdtree.py
+${PYSITELIB}/scipy/spatial/tests/test_qhull.py
 ${PYSITELIB}/scipy/special/__init__.py
 ${PYSITELIB}/scipy/special/__init__.pyc
 ${PYSITELIB}/scipy/special/__init__.pyo
-${PYSITELIB}/scipy/special/_cephes.so
+${PYSITELIB}/scipy/special/_testutils.py
+${PYSITELIB}/scipy/special/_testutils.pyc
+${PYSITELIB}/scipy/special/_testutils.pyo
+${PYSITELIB}/scipy/special/_ufuncs.so
+${PYSITELIB}/scipy/special/_ufuncs_cxx.so
+${PYSITELIB}/scipy/special/add_newdocs.py
+${PYSITELIB}/scipy/special/add_newdocs.pyc
+${PYSITELIB}/scipy/special/add_newdocs.pyo
 ${PYSITELIB}/scipy/special/basic.py
 ${PYSITELIB}/scipy/special/basic.pyc
 ${PYSITELIB}/scipy/special/basic.pyo
-${PYSITELIB}/scipy/special/gendoc.py
-${PYSITELIB}/scipy/special/gendoc.pyc
-${PYSITELIB}/scipy/special/gendoc.pyo
-${PYSITELIB}/scipy/special/info.py
-${PYSITELIB}/scipy/special/info.pyc
-${PYSITELIB}/scipy/special/info.pyo
+${PYSITELIB}/scipy/special/generate_ufuncs.py
+${PYSITELIB}/scipy/special/generate_ufuncs.pyc
+${PYSITELIB}/scipy/special/generate_ufuncs.pyo
+${PYSITELIB}/scipy/special/lambertw.py
+${PYSITELIB}/scipy/special/lambertw.pyc
+${PYSITELIB}/scipy/special/lambertw.pyo
 ${PYSITELIB}/scipy/special/orthogonal.py
 ${PYSITELIB}/scipy/special/orthogonal.pyc
 ${PYSITELIB}/scipy/special/orthogonal.pyo
@@ -995,29 +1143,40 @@ ${PYSITELIB}/scipy/special/setupscons.py
 ${PYSITELIB}/scipy/special/setupscons.pyc
 ${PYSITELIB}/scipy/special/setupscons.pyo
 ${PYSITELIB}/scipy/special/specfun.so
-${PYSITELIB}/scipy/special/special_version.py
-${PYSITELIB}/scipy/special/special_version.pyc
-${PYSITELIB}/scipy/special/special_version.pyo
 ${PYSITELIB}/scipy/special/spfun_stats.py
 ${PYSITELIB}/scipy/special/spfun_stats.pyc
 ${PYSITELIB}/scipy/special/spfun_stats.pyo
-${PYSITELIB}/scipy/special/tests/fncs_cep.dat
-${PYSITELIB}/scipy/special/tests/fncs_wof.dat
+${PYSITELIB}/scipy/special/tests/data/README
+${PYSITELIB}/scipy/special/tests/data/boost.npz
+${PYSITELIB}/scipy/special/tests/data/gsl.npz
 ${PYSITELIB}/scipy/special/tests/test_basic.py
+${PYSITELIB}/scipy/special/tests/test_data.py
+${PYSITELIB}/scipy/special/tests/test_lambertw.py
+${PYSITELIB}/scipy/special/tests/test_logit.py
+${PYSITELIB}/scipy/special/tests/test_mpmath.py
+${PYSITELIB}/scipy/special/tests/test_orthogonal.py
+${PYSITELIB}/scipy/special/tests/test_orthogonal_eval.py
 ${PYSITELIB}/scipy/special/tests/test_spfun_stats.py
 ${PYSITELIB}/scipy/stats/__init__.py
 ${PYSITELIB}/scipy/stats/__init__.pyc
 ${PYSITELIB}/scipy/stats/__init__.pyo
+${PYSITELIB}/scipy/stats/_binned_statistic.py
+${PYSITELIB}/scipy/stats/_binned_statistic.pyc
+${PYSITELIB}/scipy/stats/_binned_statistic.pyo
+${PYSITELIB}/scipy/stats/_rank.so
 ${PYSITELIB}/scipy/stats/_support.py
 ${PYSITELIB}/scipy/stats/_support.pyc
 ${PYSITELIB}/scipy/stats/_support.pyo
+${PYSITELIB}/scipy/stats/_tukeylambda_stats.py
+${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyc
+${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyo
+${PYSITELIB}/scipy/stats/contingency.py
+${PYSITELIB}/scipy/stats/contingency.pyc
+${PYSITELIB}/scipy/stats/contingency.pyo
 ${PYSITELIB}/scipy/stats/distributions.py
 ${PYSITELIB}/scipy/stats/distributions.pyc
 ${PYSITELIB}/scipy/stats/distributions.pyo
 ${PYSITELIB}/scipy/stats/futil.so
-${PYSITELIB}/scipy/stats/info.py
-${PYSITELIB}/scipy/stats/info.pyc
-${PYSITELIB}/scipy/stats/info.pyo
 ${PYSITELIB}/scipy/stats/kde.py
 ${PYSITELIB}/scipy/stats/kde.pyc
 ${PYSITELIB}/scipy/stats/kde.pyo
@@ -1047,34 +1206,36 @@ ${PYSITELIB}/scipy/stats/statlib.so
 ${PYSITELIB}/scipy/stats/stats.py
 ${PYSITELIB}/scipy/stats/stats.pyc
 ${PYSITELIB}/scipy/stats/stats.pyo
+${PYSITELIB}/scipy/stats/tests/test_binned_statistic.py
+${PYSITELIB}/scipy/stats/tests/test_contingency.py
 ${PYSITELIB}/scipy/stats/tests/test_continuous_basic.py
 ${PYSITELIB}/scipy/stats/tests/test_continuous_extra.py
 ${PYSITELIB}/scipy/stats/tests/test_discrete_basic.py
 ${PYSITELIB}/scipy/stats/tests/test_distributions.py
 ${PYSITELIB}/scipy/stats/tests/test_fit.py
+${PYSITELIB}/scipy/stats/tests/test_kdeoth.py
 ${PYSITELIB}/scipy/stats/tests/test_morestats.py
 ${PYSITELIB}/scipy/stats/tests/test_mstats_basic.py
 ${PYSITELIB}/scipy/stats/tests/test_mstats_extras.py
+${PYSITELIB}/scipy/stats/tests/test_rank.py
 ${PYSITELIB}/scipy/stats/tests/test_stats.py
+${PYSITELIB}/scipy/stats/tests/test_tukeylambda_stats.py
 ${PYSITELIB}/scipy/stats/vonmises.py
 ${PYSITELIB}/scipy/stats/vonmises.pyc
 ${PYSITELIB}/scipy/stats/vonmises.pyo
 ${PYSITELIB}/scipy/stats/vonmises_cython.so
-${PYSITELIB}/scipy/stsci/__init__.py
-${PYSITELIB}/scipy/stsci/__init__.pyc
-${PYSITELIB}/scipy/stsci/__init__.pyo
-${PYSITELIB}/scipy/stsci/setup.py
-${PYSITELIB}/scipy/stsci/setup.pyc
-${PYSITELIB}/scipy/stsci/setup.pyo
-${PYSITELIB}/scipy/stsci/setupscons.py
-${PYSITELIB}/scipy/stsci/setupscons.pyc
-${PYSITELIB}/scipy/stsci/setupscons.pyo
 ${PYSITELIB}/scipy/version.py
 ${PYSITELIB}/scipy/version.pyc
 ${PYSITELIB}/scipy/version.pyo
 ${PYSITELIB}/scipy/weave/__init__.py
 ${PYSITELIB}/scipy/weave/__init__.pyc
 ${PYSITELIB}/scipy/weave/__init__.pyo
+${PYSITELIB}/scipy/weave/_dumb_shelve.py
+${PYSITELIB}/scipy/weave/_dumb_shelve.pyc
+${PYSITELIB}/scipy/weave/_dumb_shelve.pyo
+${PYSITELIB}/scipy/weave/_dumbdbm_patched.py
+${PYSITELIB}/scipy/weave/_dumbdbm_patched.pyc
+${PYSITELIB}/scipy/weave/_dumbdbm_patched.pyo
 ${PYSITELIB}/scipy/weave/accelerate_tools.py
 ${PYSITELIB}/scipy/weave/accelerate_tools.pyc
 ${PYSITELIB}/scipy/weave/accelerate_tools.pyo
@@ -1323,9 +1484,6 @@ ${PYSITELIB}/scipy/weave/examples/wx_speed.py
 ${PYSITELIB}/scipy/weave/ext_tools.py
 ${PYSITELIB}/scipy/weave/ext_tools.pyc
 ${PYSITELIB}/scipy/weave/ext_tools.pyo
-${PYSITELIB}/scipy/weave/info.py
-${PYSITELIB}/scipy/weave/info.pyc
-${PYSITELIB}/scipy/weave/info.pyo
 ${PYSITELIB}/scipy/weave/inline_tools.py
 ${PYSITELIB}/scipy/weave/inline_tools.pyc
 ${PYSITELIB}/scipy/weave/inline_tools.pyo
diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo
index 22bc223f3aa..5fc38bfeca7 100644
--- a/math/py-scipy/distinfo
+++ b/math/py-scipy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/06/06 02:37:08 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/14 00:28:53 markd Exp $
 
-SHA1 (scipy-0.7.2.tar.gz) = c3223df023008ee339cf1d3fad74d4566af69c8a
-RMD160 (scipy-0.7.2.tar.gz) = 456e4ab9d69f9d4056bca6b52474b72bea37b122
-Size (scipy-0.7.2.tar.gz) = 4557178 bytes
+SHA1 (scipy-0.12.0.tar.gz) = 1ba2e2fc49ba321f62d6f78a5351336ed2509af3
+RMD160 (scipy-0.12.0.tar.gz) = 35f3177dbcc37e0984fc852abf23ea0aab348ee0
+Size (scipy-0.12.0.tar.gz) = 9095801 bytes