Moved f2py2e to f2py.

148 files changed, 1 insertions, 1 deletions

diff --git a/scipy/f2py2e/BUGS.txt b/scipy/f2py/BUGS.txt
index ee08863bb..ee08863bb 100644
--- a/scipy/f2py2e/BUGS.txt
+++ b/scipy/f2py/BUGS.txt
diff --git a/scipy/f2py2e/Makefile b/scipy/f2py/Makefile
index 91c199f99..91c199f99 100644
--- a/scipy/f2py2e/Makefile
+++ b/scipy/f2py/Makefile
diff --git a/scipy/f2py2e/NEWS.txt b/scipy/f2py/NEWS.txt
index a4a254405..a4a254405 100644
--- a/scipy/f2py2e/NEWS.txt
+++ b/scipy/f2py/NEWS.txt
diff --git a/scipy/f2py2e/README.txt b/scipy/f2py/README.txt
index ebe7e8c88..ebe7e8c88 100644
--- a/scipy/f2py2e/README.txt
+++ b/scipy/f2py/README.txt
diff --git a/scipy/f2py2e/TODO.txt b/scipy/f2py/TODO.txt
index fd655f2e2..fd655f2e2 100644
--- a/scipy/f2py2e/TODO.txt
+++ b/scipy/f2py/TODO.txt
diff --git a/scipy/f2py2e/__init__.py b/scipy/f2py/__init__.py
index 5c2c3e927..5c2c3e927 100644
--- a/scipy/f2py2e/__init__.py
+++ b/scipy/f2py/__init__.py
diff --git a/scipy/f2py2e/__version__.py b/scipy/f2py/__version__.py
index 11fb7b3d2..11fb7b3d2 100644
--- a/scipy/f2py2e/__version__.py
+++ b/scipy/f2py/__version__.py
diff --git a/scipy/f2py2e/auxfuncs.py b/scipy/f2py/auxfuncs.py
index 51eae0517..51eae0517 100644
--- a/scipy/f2py2e/auxfuncs.py
+++ b/scipy/f2py/auxfuncs.py
diff --git a/scipy/f2py2e/capi_maps.py b/scipy/f2py/capi_maps.py
index e4a542eaa..e4a542eaa 100644
--- a/scipy/f2py2e/capi_maps.py
+++ b/scipy/f2py/capi_maps.py
diff --git a/scipy/f2py2e/cb_rules.py b/scipy/f2py/cb_rules.py
index 666c1c6c8..666c1c6c8 100644
--- a/scipy/f2py2e/cb_rules.py
+++ b/scipy/f2py/cb_rules.py
diff --git a/scipy/f2py2e/cfuncs.py b/scipy/f2py/cfuncs.py
index 468118334..468118334 100644
--- a/scipy/f2py2e/cfuncs.py
+++ b/scipy/f2py/cfuncs.py
diff --git a/scipy/f2py2e/common_rules.py b/scipy/f2py/common_rules.py
index e7b4decca..e7b4decca 100644
--- a/scipy/f2py2e/common_rules.py
+++ b/scipy/f2py/common_rules.py
diff --git a/scipy/f2py2e/crackfortran.py b/scipy/f2py/crackfortran.py
index 2a91709bc..2a91709bc 100755
--- a/scipy/f2py2e/crackfortran.py
+++ b/scipy/f2py/crackfortran.py
diff --git a/scipy/f2py2e/diagnose.py b/scipy/f2py/diagnose.py
index 34784b39c..34784b39c 100644
--- a/scipy/f2py2e/diagnose.py
+++ b/scipy/f2py/diagnose.py
diff --git a/scipy/f2py2e/doc/Makefile b/scipy/f2py/doc/Makefile
index 2f241da0a..2f241da0a 100644
--- a/scipy/f2py2e/doc/Makefile
+++ b/scipy/f2py/doc/Makefile
diff --git a/scipy/f2py2e/doc/Release-1.x.txt b/scipy/f2py/doc/Release-1.x.txt
index 46d6fbf09..46d6fbf09 100644
--- a/scipy/f2py2e/doc/Release-1.x.txt
+++ b/scipy/f2py/doc/Release-1.x.txt
diff --git a/scipy/f2py2e/doc/Release-2.x.txt b/scipy/f2py/doc/Release-2.x.txt
index 807eb0ca8..807eb0ca8 100644
--- a/scipy/f2py2e/doc/Release-2.x.txt
+++ b/scipy/f2py/doc/Release-2.x.txt
diff --git a/scipy/f2py2e/doc/Release-3.x.txt b/scipy/f2py/doc/Release-3.x.txt
index 940771015..940771015 100644
--- a/scipy/f2py2e/doc/Release-3.x.txt
+++ b/scipy/f2py/doc/Release-3.x.txt
diff --git a/scipy/f2py2e/doc/Release-4.x.txt b/scipy/f2py/doc/Release-4.x.txt
index ed071a0cb..ed071a0cb 100644
--- a/scipy/f2py2e/doc/Release-4.x.txt
+++ b/scipy/f2py/doc/Release-4.x.txt
diff --git a/scipy/f2py2e/doc/apps.tex b/scipy/f2py/doc/apps.tex
index 513c048bd..513c048bd 100644
--- a/scipy/f2py2e/doc/apps.tex
+++ b/scipy/f2py/doc/apps.tex
diff --git a/scipy/f2py2e/doc/bugs.tex b/scipy/f2py/doc/bugs.tex
index 699ecf530..699ecf530 100644
--- a/scipy/f2py2e/doc/bugs.tex
+++ b/scipy/f2py/doc/bugs.tex
diff --git a/scipy/f2py2e/doc/collectinput.py b/scipy/f2py/doc/collectinput.py
index c2ce2bf89..c2ce2bf89 100755
--- a/scipy/f2py2e/doc/collectinput.py
+++ b/scipy/f2py/doc/collectinput.py
diff --git a/scipy/f2py2e/doc/commands.tex b/scipy/f2py/doc/commands.tex
index 5101a9ff5..5101a9ff5 100644
--- a/scipy/f2py2e/doc/commands.tex
+++ b/scipy/f2py/doc/commands.tex
diff --git a/scipy/f2py2e/doc/ex1/arr.f b/scipy/f2py/doc/ex1/arr.f
index c4e49988f..c4e49988f 100644
--- a/scipy/f2py2e/doc/ex1/arr.f
+++ b/scipy/f2py/doc/ex1/arr.f
diff --git a/scipy/f2py2e/doc/ex1/bar.f b/scipy/f2py/doc/ex1/bar.f
index c723b5af1..c723b5af1 100644
--- a/scipy/f2py2e/doc/ex1/bar.f
+++ b/scipy/f2py/doc/ex1/bar.f
diff --git a/scipy/f2py2e/doc/ex1/foo.f b/scipy/f2py/doc/ex1/foo.f
index cdcac4103..cdcac4103 100644
--- a/scipy/f2py2e/doc/ex1/foo.f
+++ b/scipy/f2py/doc/ex1/foo.f
diff --git a/scipy/f2py2e/doc/ex1/foobar-smart.f90 b/scipy/f2py/doc/ex1/foobar-smart.f90
index 61385a685..61385a685 100644
--- a/scipy/f2py2e/doc/ex1/foobar-smart.f90
+++ b/scipy/f2py/doc/ex1/foobar-smart.f90
diff --git a/scipy/f2py2e/doc/ex1/foobar.f90 b/scipy/f2py/doc/ex1/foobar.f90
index 53ac5b506..53ac5b506 100644
--- a/scipy/f2py2e/doc/ex1/foobar.f90
+++ b/scipy/f2py/doc/ex1/foobar.f90
diff --git a/scipy/f2py2e/doc/ex1/foobarmodule.tex b/scipy/f2py/doc/ex1/foobarmodule.tex
index 32411ec03..32411ec03 100644
--- a/scipy/f2py2e/doc/ex1/foobarmodule.tex
+++ b/scipy/f2py/doc/ex1/foobarmodule.tex
diff --git a/scipy/f2py2e/doc/ex1/runme b/scipy/f2py/doc/ex1/runme
index 2aac6158e..2aac6158e 100755
--- a/scipy/f2py2e/doc/ex1/runme
+++ b/scipy/f2py/doc/ex1/runme
diff --git a/scipy/f2py2e/doc/f2py2e.tex b/scipy/f2py/doc/f2py2e.tex
index 6e3e9d68c..6e3e9d68c 100644
--- a/scipy/f2py2e/doc/f2py2e.tex
+++ b/scipy/f2py/doc/f2py2e.tex
diff --git a/scipy/f2py2e/doc/f2python9-final/README.txt b/scipy/f2py/doc/f2python9-final/README.txt
index b907216b6..b907216b6 100644
--- a/scipy/f2py2e/doc/f2python9-final/README.txt
+++ b/scipy/f2py/doc/f2python9-final/README.txt
diff --git a/scipy/f2py2e/doc/f2python9-final/aerostructure.jpg b/scipy/f2py/doc/f2python9-final/aerostructure.jpg
index 896ad6e12..896ad6e12 100644
--- a/scipy/f2py2e/doc/f2python9-final/aerostructure.jpg
+++ b/scipy/f2py/doc/f2python9-final/aerostructure.jpg
diff --git a/scipy/f2py2e/doc/f2python9-final/flow.jpg b/scipy/f2py/doc/f2python9-final/flow.jpg
index cfe0f85f3..cfe0f85f3 100644
--- a/scipy/f2py2e/doc/f2python9-final/flow.jpg
+++ b/scipy/f2py/doc/f2python9-final/flow.jpg
diff --git a/scipy/f2py2e/doc/f2python9-final/mk_html.sh b/scipy/f2py/doc/f2python9-final/mk_html.sh
index 944110e93..944110e93 100755
--- a/scipy/f2py2e/doc/f2python9-final/mk_html.sh
+++ b/scipy/f2py/doc/f2python9-final/mk_html.sh
diff --git a/scipy/f2py2e/doc/f2python9-final/mk_pdf.sh b/scipy/f2py/doc/f2python9-final/mk_pdf.sh
index b773028b7..b773028b7 100755
--- a/scipy/f2py2e/doc/f2python9-final/mk_pdf.sh
+++ b/scipy/f2py/doc/f2python9-final/mk_pdf.sh
diff --git a/scipy/f2py2e/doc/f2python9-final/mk_ps.sh b/scipy/f2py/doc/f2python9-final/mk_ps.sh
index 4b0863fcd..4b0863fcd 100755
--- a/scipy/f2py2e/doc/f2python9-final/mk_ps.sh
+++ b/scipy/f2py/doc/f2python9-final/mk_ps.sh
diff --git a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1.f b/scipy/f2py/doc/f2python9-final/src/examples/exp1.f
index 36bee50b0..36bee50b0 100644
--- a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1.f
+++ b/scipy/f2py/doc/f2python9-final/src/examples/exp1.f
diff --git a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1mess.txt b/scipy/f2py/doc/f2python9-final/src/examples/exp1mess.txt
index ae1545718..ae1545718 100644
--- a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1mess.txt
+++ b/scipy/f2py/doc/f2python9-final/src/examples/exp1mess.txt
diff --git a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1session.txt b/scipy/f2py/doc/f2python9-final/src/examples/exp1session.txt
index 9bec9198e..9bec9198e 100644
--- a/scipy/f2py2e/doc/f2python9-final/src/examples/exp1session.txt
+++ b/scipy/f2py/doc/f2python9-final/src/examples/exp1session.txt
diff --git a/scipy/f2py2e/doc/f2python9-final/src/examples/foo.pyf b/scipy/f2py/doc/f2python9-final/src/examples/foo.pyf
index 516bb292f..516bb292f 100644
--- a/scipy/f2py2e/doc/f2python9-final/src/examples/foo.pyf
+++ b/scipy/f2py/doc/f2python9-final/src/examples/foo.pyf
diff --git a/scipy/f2py2e/doc/f2python9-final/src/examples/foom.pyf b/scipy/f2py/doc/f2python9-final/src/examples/foom.pyf
index 6392ebc95..6392ebc95 100644
--- a/scipy/f2py2e/doc/f2python9-final/src/examples/foom.pyf
+++ b/scipy/f2py/doc/f2python9-final/src/examples/foom.pyf
diff --git a/scipy/f2py2e/doc/f2python9-final/structure.jpg b/scipy/f2py/doc/f2python9-final/structure.jpg
index 9aa691339..9aa691339 100644
--- a/scipy/f2py2e/doc/f2python9-final/structure.jpg
+++ b/scipy/f2py/doc/f2python9-final/structure.jpg
diff --git a/scipy/f2py2e/doc/fortranobject.tex b/scipy/f2py/doc/fortranobject.tex
index dbb244cdd..dbb244cdd 100644
--- a/scipy/f2py2e/doc/fortranobject.tex
+++ b/scipy/f2py/doc/fortranobject.tex
diff --git a/scipy/f2py2e/doc/index.html b/scipy/f2py/doc/index.html
index abddd7d43..abddd7d43 100644
--- a/scipy/f2py2e/doc/index.html
+++ b/scipy/f2py/doc/index.html
diff --git a/scipy/f2py2e/doc/intro.tex b/scipy/f2py/doc/intro.tex
index d9625b09c..d9625b09c 100644
--- a/scipy/f2py2e/doc/intro.tex
+++ b/scipy/f2py/doc/intro.tex
diff --git a/scipy/f2py2e/doc/multiarray/array_from_pyobj.c b/scipy/f2py/doc/multiarray/array_from_pyobj.c
index 7e0de9a74..7e0de9a74 100644
--- a/scipy/f2py2e/doc/multiarray/array_from_pyobj.c
+++ b/scipy/f2py/doc/multiarray/array_from_pyobj.c
diff --git a/scipy/f2py2e/doc/multiarray/bar.c b/scipy/f2py/doc/multiarray/bar.c
index 350636ea6..350636ea6 100644
--- a/scipy/f2py2e/doc/multiarray/bar.c
+++ b/scipy/f2py/doc/multiarray/bar.c
diff --git a/scipy/f2py2e/doc/multiarray/foo.f b/scipy/f2py/doc/multiarray/foo.f
index f8c39c4d1..f8c39c4d1 100644
--- a/scipy/f2py2e/doc/multiarray/foo.f
+++ b/scipy/f2py/doc/multiarray/foo.f
diff --git a/scipy/f2py2e/doc/multiarray/fortran_array_from_pyobj.txt b/scipy/f2py/doc/multiarray/fortran_array_from_pyobj.txt
index c7b945c84..c7b945c84 100644
--- a/scipy/f2py2e/doc/multiarray/fortran_array_from_pyobj.txt
+++ b/scipy/f2py/doc/multiarray/fortran_array_from_pyobj.txt
diff --git a/scipy/f2py2e/doc/multiarray/fun.pyf b/scipy/f2py/doc/multiarray/fun.pyf
index ed5d1923f..ed5d1923f 100644
--- a/scipy/f2py2e/doc/multiarray/fun.pyf
+++ b/scipy/f2py/doc/multiarray/fun.pyf
diff --git a/scipy/f2py2e/doc/multiarray/run.pyf b/scipy/f2py/doc/multiarray/run.pyf
index bb12a439b..bb12a439b 100644
--- a/scipy/f2py2e/doc/multiarray/run.pyf
+++ b/scipy/f2py/doc/multiarray/run.pyf
diff --git a/scipy/f2py2e/doc/multiarray/transpose.txt b/scipy/f2py/doc/multiarray/transpose.txt
index a8d41e6df..a8d41e6df 100644
--- a/scipy/f2py2e/doc/multiarray/transpose.txt
+++ b/scipy/f2py/doc/multiarray/transpose.txt
diff --git a/scipy/f2py2e/doc/multiarrays.txt b/scipy/f2py/doc/multiarrays.txt
index 704208976..704208976 100644
--- a/scipy/f2py2e/doc/multiarrays.txt
+++ b/scipy/f2py/doc/multiarrays.txt
diff --git a/scipy/f2py2e/doc/notes.tex b/scipy/f2py/doc/notes.tex
index 2746b049d..2746b049d 100644
--- a/scipy/f2py2e/doc/notes.tex
+++ b/scipy/f2py/doc/notes.tex
diff --git a/scipy/f2py2e/doc/oldnews.html b/scipy/f2py/doc/oldnews.html
index 914265bbe..914265bbe 100644
--- a/scipy/f2py2e/doc/oldnews.html
+++ b/scipy/f2py/doc/oldnews.html
diff --git a/scipy/f2py2e/doc/options.tex b/scipy/f2py/doc/options.tex
index 84d9410f8..84d9410f8 100644
--- a/scipy/f2py2e/doc/options.tex
+++ b/scipy/f2py/doc/options.tex
diff --git a/scipy/f2py2e/doc/python9.tex b/scipy/f2py/doc/python9.tex
index cda3cd18b..cda3cd18b 100644
--- a/scipy/f2py2e/doc/python9.tex
+++ b/scipy/f2py/doc/python9.tex
diff --git a/scipy/f2py2e/doc/signaturefile.tex b/scipy/f2py/doc/signaturefile.tex
index 3cd16d890..3cd16d890 100644
--- a/scipy/f2py2e/doc/signaturefile.tex
+++ b/scipy/f2py/doc/signaturefile.tex
diff --git a/scipy/f2py2e/doc/using_F_compiler.txt b/scipy/f2py/doc/using_F_compiler.txt
index 3067f0776..3067f0776 100644
--- a/scipy/f2py2e/doc/using_F_compiler.txt
+++ b/scipy/f2py/doc/using_F_compiler.txt
diff --git a/scipy/f2py2e/doc/win32_notes.txt b/scipy/f2py/doc/win32_notes.txt
index 1b7b9029c..1b7b9029c 100644
--- a/scipy/f2py2e/doc/win32_notes.txt
+++ b/scipy/f2py/doc/win32_notes.txt
diff --git a/scipy/f2py2e/docs/FAQ.txt b/scipy/f2py/docs/FAQ.txt
index 580770185..580770185 100644
--- a/scipy/f2py2e/docs/FAQ.txt
+++ b/scipy/f2py/docs/FAQ.txt
diff --git a/scipy/f2py2e/docs/HISTORY.txt b/scipy/f2py/docs/HISTORY.txt
index 876ab2362..876ab2362 100644
--- a/scipy/f2py2e/docs/HISTORY.txt
+++ b/scipy/f2py/docs/HISTORY.txt
diff --git a/scipy/f2py2e/docs/OLDNEWS.txt b/scipy/f2py/docs/OLDNEWS.txt
index b21215464..b21215464 100644
--- a/scipy/f2py2e/docs/OLDNEWS.txt
+++ b/scipy/f2py/docs/OLDNEWS.txt
diff --git a/scipy/f2py2e/docs/README.txt b/scipy/f2py/docs/README.txt
index fc7149645..fc7149645 100644
--- a/scipy/f2py2e/docs/README.txt
+++ b/scipy/f2py/docs/README.txt
diff --git a/scipy/f2py2e/docs/TESTING.txt b/scipy/f2py/docs/TESTING.txt
index feae18dc6..feae18dc6 100644
--- a/scipy/f2py2e/docs/TESTING.txt
+++ b/scipy/f2py/docs/TESTING.txt
diff --git a/scipy/f2py2e/docs/THANKS.txt b/scipy/f2py/docs/THANKS.txt
index cbaa083fc..cbaa083fc 100644
--- a/scipy/f2py2e/docs/THANKS.txt
+++ b/scipy/f2py/docs/THANKS.txt
diff --git a/scipy/f2py2e/docs/default.css b/scipy/f2py/docs/default.css
index 9289e2826..9289e2826 100644
--- a/scipy/f2py2e/docs/default.css
+++ b/scipy/f2py/docs/default.css
diff --git a/scipy/f2py2e/docs/docutils.conf b/scipy/f2py/docs/docutils.conf
index 4e5a8425b..4e5a8425b 100644
--- a/scipy/f2py2e/docs/docutils.conf
+++ b/scipy/f2py/docs/docutils.conf
diff --git a/scipy/f2py2e/docs/hello.f b/scipy/f2py/docs/hello.f
index 3e0dc6d21..3e0dc6d21 100644
--- a/scipy/f2py2e/docs/hello.f
+++ b/scipy/f2py/docs/hello.f
diff --git a/scipy/f2py2e/docs/pyforttest.pyf b/scipy/f2py/docs/pyforttest.pyf
index 79a9ae205..79a9ae205 100644
--- a/scipy/f2py2e/docs/pyforttest.pyf
+++ b/scipy/f2py/docs/pyforttest.pyf
diff --git a/scipy/f2py2e/docs/pytest.py b/scipy/f2py/docs/pytest.py
index abd3487df..abd3487df 100644
--- a/scipy/f2py2e/docs/pytest.py
+++ b/scipy/f2py/docs/pytest.py
diff --git a/scipy/f2py2e/docs/simple.f b/scipy/f2py/docs/simple.f
index ba468a509..ba468a509 100644
--- a/scipy/f2py2e/docs/simple.f
+++ b/scipy/f2py/docs/simple.f
diff --git a/scipy/f2py2e/docs/simple_session.dat b/scipy/f2py/docs/simple_session.dat
index 10d9dc962..10d9dc962 100644
--- a/scipy/f2py2e/docs/simple_session.dat
+++ b/scipy/f2py/docs/simple_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/allocarr.f90 b/scipy/f2py/docs/usersguide/allocarr.f90
index e0d6c2ec8..e0d6c2ec8 100644
--- a/scipy/f2py2e/docs/usersguide/allocarr.f90
+++ b/scipy/f2py/docs/usersguide/allocarr.f90
diff --git a/scipy/f2py2e/docs/usersguide/allocarr_session.dat b/scipy/f2py/docs/usersguide/allocarr_session.dat
index fc91959b7..fc91959b7 100644
--- a/scipy/f2py2e/docs/usersguide/allocarr_session.dat
+++ b/scipy/f2py/docs/usersguide/allocarr_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/array.f b/scipy/f2py/docs/usersguide/array.f
index ef20c9c20..ef20c9c20 100644
--- a/scipy/f2py2e/docs/usersguide/array.f
+++ b/scipy/f2py/docs/usersguide/array.f
diff --git a/scipy/f2py2e/docs/usersguide/array_session.dat b/scipy/f2py/docs/usersguide/array_session.dat
index f64933482..f64933482 100644
--- a/scipy/f2py2e/docs/usersguide/array_session.dat
+++ b/scipy/f2py/docs/usersguide/array_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/calculate.f b/scipy/f2py/docs/usersguide/calculate.f
index 1cda1c8dd..1cda1c8dd 100644
--- a/scipy/f2py2e/docs/usersguide/calculate.f
+++ b/scipy/f2py/docs/usersguide/calculate.f
diff --git a/scipy/f2py2e/docs/usersguide/calculate_session.dat b/scipy/f2py/docs/usersguide/calculate_session.dat
index 2fe64f522..2fe64f522 100644
--- a/scipy/f2py2e/docs/usersguide/calculate_session.dat
+++ b/scipy/f2py/docs/usersguide/calculate_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/callback.f b/scipy/f2py/docs/usersguide/callback.f
index 6e9bfb920..6e9bfb920 100644
--- a/scipy/f2py2e/docs/usersguide/callback.f
+++ b/scipy/f2py/docs/usersguide/callback.f
diff --git a/scipy/f2py2e/docs/usersguide/callback2.pyf b/scipy/f2py/docs/usersguide/callback2.pyf
index 3d77eed24..3d77eed24 100644
--- a/scipy/f2py2e/docs/usersguide/callback2.pyf
+++ b/scipy/f2py/docs/usersguide/callback2.pyf
diff --git a/scipy/f2py2e/docs/usersguide/callback_session.dat b/scipy/f2py/docs/usersguide/callback_session.dat
index cd2f26084..cd2f26084 100644
--- a/scipy/f2py2e/docs/usersguide/callback_session.dat
+++ b/scipy/f2py/docs/usersguide/callback_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/common.f b/scipy/f2py/docs/usersguide/common.f
index b098ab20c..b098ab20c 100644
--- a/scipy/f2py2e/docs/usersguide/common.f
+++ b/scipy/f2py/docs/usersguide/common.f
diff --git a/scipy/f2py2e/docs/usersguide/common_session.dat b/scipy/f2py/docs/usersguide/common_session.dat
index 846fdaa07..846fdaa07 100644
--- a/scipy/f2py2e/docs/usersguide/common_session.dat
+++ b/scipy/f2py/docs/usersguide/common_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/compile_session.dat b/scipy/f2py/docs/usersguide/compile_session.dat
index 0d8408198..0d8408198 100644
--- a/scipy/f2py2e/docs/usersguide/compile_session.dat
+++ b/scipy/f2py/docs/usersguide/compile_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/default.css b/scipy/f2py/docs/usersguide/default.css
index bb7226161..bb7226161 100644
--- a/scipy/f2py2e/docs/usersguide/default.css
+++ b/scipy/f2py/docs/usersguide/default.css
diff --git a/scipy/f2py2e/docs/usersguide/docutils.conf b/scipy/f2py/docs/usersguide/docutils.conf
index b772fd137..b772fd137 100644
--- a/scipy/f2py2e/docs/usersguide/docutils.conf
+++ b/scipy/f2py/docs/usersguide/docutils.conf
diff --git a/scipy/f2py2e/docs/usersguide/extcallback.f b/scipy/f2py/docs/usersguide/extcallback.f
index 9a800628e..9a800628e 100644
--- a/scipy/f2py2e/docs/usersguide/extcallback.f
+++ b/scipy/f2py/docs/usersguide/extcallback.f
diff --git a/scipy/f2py2e/docs/usersguide/extcallback_session.dat b/scipy/f2py/docs/usersguide/extcallback_session.dat
index c22935ea0..c22935ea0 100644
--- a/scipy/f2py2e/docs/usersguide/extcallback_session.dat
+++ b/scipy/f2py/docs/usersguide/extcallback_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/fib1.f b/scipy/f2py/docs/usersguide/fib1.f
index cfbb1eea0..cfbb1eea0 100644
--- a/scipy/f2py2e/docs/usersguide/fib1.f
+++ b/scipy/f2py/docs/usersguide/fib1.f
diff --git a/scipy/f2py2e/docs/usersguide/fib1.pyf b/scipy/f2py/docs/usersguide/fib1.pyf
index 3d6cc0a54..3d6cc0a54 100644
--- a/scipy/f2py2e/docs/usersguide/fib1.pyf
+++ b/scipy/f2py/docs/usersguide/fib1.pyf
diff --git a/scipy/f2py2e/docs/usersguide/fib2.pyf b/scipy/f2py/docs/usersguide/fib2.pyf
index 4a5ae29f1..4a5ae29f1 100644
--- a/scipy/f2py2e/docs/usersguide/fib2.pyf
+++ b/scipy/f2py/docs/usersguide/fib2.pyf
diff --git a/scipy/f2py2e/docs/usersguide/fib3.f b/scipy/f2py/docs/usersguide/fib3.f
index 08b050cd2..08b050cd2 100644
--- a/scipy/f2py2e/docs/usersguide/fib3.f
+++ b/scipy/f2py/docs/usersguide/fib3.f
diff --git a/scipy/f2py2e/docs/usersguide/ftype.f b/scipy/f2py/docs/usersguide/ftype.f
index cabbb9e2d..cabbb9e2d 100644
--- a/scipy/f2py2e/docs/usersguide/ftype.f
+++ b/scipy/f2py/docs/usersguide/ftype.f
diff --git a/scipy/f2py2e/docs/usersguide/ftype_session.dat b/scipy/f2py/docs/usersguide/ftype_session.dat
index 01f9febaf..01f9febaf 100644
--- a/scipy/f2py2e/docs/usersguide/ftype_session.dat
+++ b/scipy/f2py/docs/usersguide/ftype_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/index.txt b/scipy/f2py/docs/usersguide/index.txt
index 9fafb99fb..9fafb99fb 100644
--- a/scipy/f2py2e/docs/usersguide/index.txt
+++ b/scipy/f2py/docs/usersguide/index.txt
diff --git a/scipy/f2py2e/docs/usersguide/moddata.f90 b/scipy/f2py/docs/usersguide/moddata.f90
index 0e98f0467..0e98f0467 100644
--- a/scipy/f2py2e/docs/usersguide/moddata.f90
+++ b/scipy/f2py/docs/usersguide/moddata.f90
diff --git a/scipy/f2py2e/docs/usersguide/moddata_session.dat b/scipy/f2py/docs/usersguide/moddata_session.dat
index 1ec212f8b..1ec212f8b 100644
--- a/scipy/f2py2e/docs/usersguide/moddata_session.dat
+++ b/scipy/f2py/docs/usersguide/moddata_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/run_main_session.dat b/scipy/f2py/docs/usersguide/run_main_session.dat
index 29ecc3dfe..29ecc3dfe 100644
--- a/scipy/f2py2e/docs/usersguide/run_main_session.dat
+++ b/scipy/f2py/docs/usersguide/run_main_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/scalar.f b/scipy/f2py/docs/usersguide/scalar.f
index c22f639ed..c22f639ed 100644
--- a/scipy/f2py2e/docs/usersguide/scalar.f
+++ b/scipy/f2py/docs/usersguide/scalar.f
diff --git a/scipy/f2py2e/docs/usersguide/scalar_session.dat b/scipy/f2py/docs/usersguide/scalar_session.dat
index 4fe8c03b1..4fe8c03b1 100644
--- a/scipy/f2py2e/docs/usersguide/scalar_session.dat
+++ b/scipy/f2py/docs/usersguide/scalar_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/setup_example.py b/scipy/f2py/docs/usersguide/setup_example.py
index a7d27403a..a7d27403a 100644
--- a/scipy/f2py2e/docs/usersguide/setup_example.py
+++ b/scipy/f2py/docs/usersguide/setup_example.py
diff --git a/scipy/f2py2e/docs/usersguide/spam.pyf b/scipy/f2py/docs/usersguide/spam.pyf
index 21ea18b77..21ea18b77 100644
--- a/scipy/f2py2e/docs/usersguide/spam.pyf
+++ b/scipy/f2py/docs/usersguide/spam.pyf
diff --git a/scipy/f2py2e/docs/usersguide/spam_session.dat b/scipy/f2py/docs/usersguide/spam_session.dat
index 7f99d13f9..7f99d13f9 100644
--- a/scipy/f2py2e/docs/usersguide/spam_session.dat
+++ b/scipy/f2py/docs/usersguide/spam_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/string.f b/scipy/f2py/docs/usersguide/string.f
index 9246f02e7..9246f02e7 100644
--- a/scipy/f2py2e/docs/usersguide/string.f
+++ b/scipy/f2py/docs/usersguide/string.f
diff --git a/scipy/f2py2e/docs/usersguide/string_session.dat b/scipy/f2py/docs/usersguide/string_session.dat
index 64ebcb3f4..64ebcb3f4 100644
--- a/scipy/f2py2e/docs/usersguide/string_session.dat
+++ b/scipy/f2py/docs/usersguide/string_session.dat
diff --git a/scipy/f2py2e/docs/usersguide/var.pyf b/scipy/f2py/docs/usersguide/var.pyf
index 8275ff3af..8275ff3af 100644
--- a/scipy/f2py2e/docs/usersguide/var.pyf
+++ b/scipy/f2py/docs/usersguide/var.pyf
diff --git a/scipy/f2py2e/docs/usersguide/var_session.dat b/scipy/f2py/docs/usersguide/var_session.dat
index fb0f798bf..fb0f798bf 100644
--- a/scipy/f2py2e/docs/usersguide/var_session.dat
+++ b/scipy/f2py/docs/usersguide/var_session.dat
diff --git a/scipy/f2py2e/f2py.1 b/scipy/f2py/f2py.1
index 3b9f054af..3b9f054af 100644
--- a/scipy/f2py2e/f2py.1
+++ b/scipy/f2py/f2py.1
diff --git a/scipy/f2py2e/f2py2e.py b/scipy/f2py/f2py2e.py
index 264563da0..264563da0 100755
--- a/scipy/f2py2e/f2py2e.py
+++ b/scipy/f2py/f2py2e.py
diff --git a/scipy/f2py2e/f2py_testing.py b/scipy/f2py/f2py_testing.py
index 1126c3085..1126c3085 100644
--- a/scipy/f2py2e/f2py_testing.py
+++ b/scipy/f2py/f2py_testing.py
diff --git a/scipy/f2py2e/f90mod_rules.py b/scipy/f2py/f90mod_rules.py
index 9c0d54900..9c0d54900 100644
--- a/scipy/f2py2e/f90mod_rules.py
+++ b/scipy/f2py/f90mod_rules.py
diff --git a/scipy/f2py2e/func2subr.py b/scipy/f2py/func2subr.py
index 4039c9996..4039c9996 100644
--- a/scipy/f2py2e/func2subr.py
+++ b/scipy/f2py/func2subr.py
diff --git a/scipy/f2py2e/rules.py b/scipy/f2py/rules.py
index cb2d78e65..cb2d78e65 100644
--- a/scipy/f2py2e/rules.py
+++ b/scipy/f2py/rules.py
diff --git a/scipy/f2py2e/setup.cfg b/scipy/f2py/setup.cfg
index 14669544c..14669544c 100644
--- a/scipy/f2py2e/setup.cfg
+++ b/scipy/f2py/setup.cfg
diff --git a/scipy/f2py2e/setup.py b/scipy/f2py/setup.py
index 2e804e0bf..2e804e0bf 100755
--- a/scipy/f2py2e/setup.py
+++ b/scipy/f2py/setup.py
diff --git a/scipy/f2py2e/src/fortranobject.c b/scipy/f2py/src/fortranobject.c
index 16daa546a..16daa546a 100644
--- a/scipy/f2py2e/src/fortranobject.c
+++ b/scipy/f2py/src/fortranobject.c
diff --git a/scipy/f2py2e/src/fortranobject.h b/scipy/f2py/src/fortranobject.h
index 680e6690e..680e6690e 100644
--- a/scipy/f2py2e/src/fortranobject.h
+++ b/scipy/f2py/src/fortranobject.h
diff --git a/scipy/f2py2e/src/test/Makefile b/scipy/f2py/src/test/Makefile
index 0f8869f72..0f8869f72 100644
--- a/scipy/f2py2e/src/test/Makefile
+++ b/scipy/f2py/src/test/Makefile
diff --git a/scipy/f2py2e/src/test/bar.f b/scipy/f2py/src/test/bar.f
index 5354ceaf9..5354ceaf9 100644
--- a/scipy/f2py2e/src/test/bar.f
+++ b/scipy/f2py/src/test/bar.f
diff --git a/scipy/f2py2e/src/test/foo.f b/scipy/f2py/src/test/foo.f
index 5354ceaf9..5354ceaf9 100644
--- a/scipy/f2py2e/src/test/foo.f
+++ b/scipy/f2py/src/test/foo.f
diff --git a/scipy/f2py2e/src/test/foo90.f90 b/scipy/f2py/src/test/foo90.f90
index dbca7e95b..dbca7e95b 100644
--- a/scipy/f2py2e/src/test/foo90.f90
+++ b/scipy/f2py/src/test/foo90.f90
diff --git a/scipy/f2py2e/src/test/foomodule.c b/scipy/f2py/src/test/foomodule.c
index 0a954676e..0a954676e 100644
--- a/scipy/f2py2e/src/test/foomodule.c
+++ b/scipy/f2py/src/test/foomodule.c
diff --git a/scipy/f2py2e/src/test/wrap.f b/scipy/f2py/src/test/wrap.f
index 9414eb9f6..9414eb9f6 100644
--- a/scipy/f2py2e/src/test/wrap.f
+++ b/scipy/f2py/src/test/wrap.f
diff --git a/scipy/f2py2e/tests/array_from_pyobj/__init__.py b/scipy/f2py/tests/array_from_pyobj/__init__.py
index e69de29bb..e69de29bb 100644
--- a/scipy/f2py2e/tests/array_from_pyobj/__init__.py
+++ b/scipy/f2py/tests/array_from_pyobj/__init__.py
diff --git a/scipy/f2py2e/tests/array_from_pyobj/setup.py b/scipy/f2py/tests/array_from_pyobj/setup.py
index ff7ff8cfc..ff7ff8cfc 100644
--- a/scipy/f2py2e/tests/array_from_pyobj/setup.py
+++ b/scipy/f2py/tests/array_from_pyobj/setup.py
diff --git a/scipy/f2py2e/tests/array_from_pyobj/tests/test_array_from_pyobj.py b/scipy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
index 309ad03f6..309ad03f6 100644
--- a/scipy/f2py2e/tests/array_from_pyobj/tests/test_array_from_pyobj.py
+++ b/scipy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
diff --git a/scipy/f2py2e/tests/array_from_pyobj/wrapmodule.c b/scipy/f2py/tests/array_from_pyobj/wrapmodule.c
index 0d9e41f1c..0d9e41f1c 100644
--- a/scipy/f2py2e/tests/array_from_pyobj/wrapmodule.c
+++ b/scipy/f2py/tests/array_from_pyobj/wrapmodule.c
diff --git a/scipy/f2py2e/tests/c/return_real.py b/scipy/f2py/tests/c/return_real.py
index 7d35b28cf..7d35b28cf 100644
--- a/scipy/f2py2e/tests/c/return_real.py
+++ b/scipy/f2py/tests/c/return_real.py
diff --git a/scipy/f2py2e/tests/f77/callback.py b/scipy/f2py/tests/f77/callback.py
index 672504bc7..672504bc7 100644
--- a/scipy/f2py2e/tests/f77/callback.py
+++ b/scipy/f2py/tests/f77/callback.py
diff --git a/scipy/f2py2e/tests/f77/return_character.py b/scipy/f2py/tests/f77/return_character.py
index 3361c11f5..3361c11f5 100644
--- a/scipy/f2py2e/tests/f77/return_character.py
+++ b/scipy/f2py/tests/f77/return_character.py
diff --git a/scipy/f2py2e/tests/f77/return_complex.py b/scipy/f2py/tests/f77/return_complex.py
index 39743a9f6..39743a9f6 100644
--- a/scipy/f2py2e/tests/f77/return_complex.py
+++ b/scipy/f2py/tests/f77/return_complex.py
diff --git a/scipy/f2py2e/tests/f77/return_integer.py b/scipy/f2py/tests/f77/return_integer.py
index f50ab52da..f50ab52da 100644
--- a/scipy/f2py2e/tests/f77/return_integer.py
+++ b/scipy/f2py/tests/f77/return_integer.py
diff --git a/scipy/f2py2e/tests/f77/return_logical.py b/scipy/f2py/tests/f77/return_logical.py
index e252e03a6..e252e03a6 100644
--- a/scipy/f2py2e/tests/f77/return_logical.py
+++ b/scipy/f2py/tests/f77/return_logical.py
diff --git a/scipy/f2py2e/tests/f77/return_real.py b/scipy/f2py/tests/f77/return_real.py
index 37f97a06d..37f97a06d 100644
--- a/scipy/f2py2e/tests/f77/return_real.py
+++ b/scipy/f2py/tests/f77/return_real.py
diff --git a/scipy/f2py2e/tests/f90/return_character.py b/scipy/f2py/tests/f90/return_character.py
index 0bd7be701..0bd7be701 100644
--- a/scipy/f2py2e/tests/f90/return_character.py
+++ b/scipy/f2py/tests/f90/return_character.py
diff --git a/scipy/f2py2e/tests/f90/return_complex.py b/scipy/f2py/tests/f90/return_complex.py
index 36d8707fc..36d8707fc 100644
--- a/scipy/f2py2e/tests/f90/return_complex.py
+++ b/scipy/f2py/tests/f90/return_complex.py
diff --git a/scipy/f2py2e/tests/f90/return_integer.py b/scipy/f2py/tests/f90/return_integer.py
index 635252ce9..635252ce9 100644
--- a/scipy/f2py2e/tests/f90/return_integer.py
+++ b/scipy/f2py/tests/f90/return_integer.py
diff --git a/scipy/f2py2e/tests/f90/return_logical.py b/scipy/f2py/tests/f90/return_logical.py
index c9479edaf..c9479edaf 100644
--- a/scipy/f2py2e/tests/f90/return_logical.py
+++ b/scipy/f2py/tests/f90/return_logical.py
diff --git a/scipy/f2py2e/tests/f90/return_real.py b/scipy/f2py/tests/f90/return_real.py
index 263e28165..263e28165 100644
--- a/scipy/f2py2e/tests/f90/return_real.py
+++ b/scipy/f2py/tests/f90/return_real.py
diff --git a/scipy/f2py2e/tests/mixed/foo.f b/scipy/f2py/tests/mixed/foo.f
index c34742578..c34742578 100644
--- a/scipy/f2py2e/tests/mixed/foo.f
+++ b/scipy/f2py/tests/mixed/foo.f
diff --git a/scipy/f2py2e/tests/mixed/foo_fixed.f90 b/scipy/f2py/tests/mixed/foo_fixed.f90
index 7543a6acb..7543a6acb 100644
--- a/scipy/f2py2e/tests/mixed/foo_fixed.f90
+++ b/scipy/f2py/tests/mixed/foo_fixed.f90
diff --git a/scipy/f2py2e/tests/mixed/foo_free.f90 b/scipy/f2py/tests/mixed/foo_free.f90
index c1b641f13..c1b641f13 100644
--- a/scipy/f2py2e/tests/mixed/foo_free.f90
+++ b/scipy/f2py/tests/mixed/foo_free.f90
diff --git a/scipy/f2py2e/tests/mixed/run.py b/scipy/f2py/tests/mixed/run.py
index 6f4b7d444..6f4b7d444 100644
--- a/scipy/f2py2e/tests/mixed/run.py
+++ b/scipy/f2py/tests/mixed/run.py
diff --git a/scipy/f2py2e/tests/run_all.py b/scipy/f2py/tests/run_all.py
index 016e68c29..016e68c29 100755
--- a/scipy/f2py2e/tests/run_all.py
+++ b/scipy/f2py/tests/run_all.py
diff --git a/scipy/f2py2e/use_rules.py b/scipy/f2py/use_rules.py
index 8affcbe41..8affcbe41 100644
--- a/scipy/f2py2e/use_rules.py
+++ b/scipy/f2py/use_rules.py
diff --git a/scipy/setup.py b/scipy/setup.py
index 6c065a50d..e257bee98 100644
--- a/scipy/setup.py
+++ b/scipy/setup.py
@@ -7,7 +7,7 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('distutils')
     config.add_subpackage('weave')
     config.add_subpackage('test')
-    config.add_subpackage('f2py2e') # installed as scipy.f2py
+    config.add_subpackage('f2py') # installed as scipy.f2py
     config.add_subpackage('base')
     config.add_subpackage('corelib') # installed as scipy.lib
     config.add_subpackage('basic')