Change License text to NumPy License (permission granted by Pearu)

17 files changed, 21 insertions, 22 deletions

diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py
index 51eae0517..4a237d54f 100644
--- a/numpy/f2py/auxfuncs.py
+++ b/numpy/f2py/auxfuncs.py
@@ -6,7 +6,8 @@ Auxiliary functions for f2py2e.
 Copyright 1999,2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy (BSD style) LICENSE. 
+
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/07/24 19:01:55 $
diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py
index e4a542eaa..123fe7ed8 100644
--- a/numpy/f2py/capi_maps.py
+++ b/numpy/f2py/capi_maps.py
@@ -4,7 +4,7 @@
 Copyright 1999,2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/05/06 10:57:33 $
diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
index 666c1c6c8..314201d87 100644
--- a/numpy/f2py/cb_rules.py
+++ b/numpy/f2py/cb_rules.py
@@ -6,7 +6,7 @@ Build call-back mechanism for f2py2e.
 Copyright 2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/07/20 11:27:58 $
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index aec1509ff..fa6e6e034 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -7,7 +7,7 @@ Only required declarations/macros/functions will be used.
 Copyright 1999,2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/05/06 11:42:34 $
diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py
index e7b4decca..6e8eee49d 100644
--- a/numpy/f2py/common_rules.py
+++ b/numpy/f2py/common_rules.py
@@ -6,7 +6,7 @@ Build common block mechanism for f2py2e.
 Copyright 2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/05/06 10:57:33 $
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
index 2a91709bc..b5b6599d8 100755
--- a/numpy/f2py/crackfortran.py
+++ b/numpy/f2py/crackfortran.py
@@ -6,7 +6,7 @@ crackfortran --- read fortran (77,90) code and extract declaration information.
 Copyright 1999-2004 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/09/27 07:13:49 $
diff --git a/numpy/f2py/doc/collectinput.py b/numpy/f2py/doc/collectinput.py
index c2ce2bf89..7b81b7517 100755
--- a/numpy/f2py/doc/collectinput.py
+++ b/numpy/f2py/doc/collectinput.py
@@ -7,7 +7,7 @@ collectinput - Collects all files that are included to a main Latex document
 Copyright 1999 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 
diff --git a/numpy/f2py/doc/index.html b/numpy/f2py/doc/index.html
index 6b6466b75..e162ed41a 100644
--- a/numpy/f2py/doc/index.html
+++ b/numpy/f2py/doc/index.html
@@ -43,8 +43,7 @@ containing wrapper functions of Fortran routines. I call this
 tool as <em>F2PY &shy; Fortran to Python Interface Generator</em>.
 It is completely written in <a href="http://www.python.org">Python</a>
 language and can be called from the command line as <code>f2py</code>.
-<em>F2PY</em> is released under the terms of <a
-href="http://www.fsf.org/copyleft/lesser.html">GNU LGPL</a>. 
+<em>F2PY</em> (in NumPy) is released under the terms of the NumPy License.
 
 
 <h2><code>f2py</code>, Second Edition</h2>
@@ -226,7 +225,7 @@ You can browse <code>f2py</code> CVS repository <a href="http://cens.ioc.ee/cgi-
 <A href="http://cens.ioc.ee/~pearu/" target="_top">Pearu Peterson</A>
 <A href="mailto:pearu(at)ioc.ee">&lt;pearu(at)ioc.ee&gt;</A><BR>
 <!-- hhmts start -->
-Last modified: Mon Dec  3 19:40:26 EET 2001
+Last modified: Fri Jan 20 14:55:12 MST 2006
 <!-- hhmts end -->
 </ADDRESS>
 <!-- You may want to comment the following line out when the document is final-->
diff --git a/numpy/f2py/docs/README.txt b/numpy/f2py/docs/README.txt
index 1946a3a91..cec8a6ec0 100644
--- a/numpy/f2py/docs/README.txt
+++ b/numpy/f2py/docs/README.txt
@@ -5,7 +5,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :Author: Pearu Peterson <pearu@cens.ioc.ee>
-:License: LGPL_.
+:License: NumPy License
 :Web-site: http://cens.ioc.ee/projects/f2py2e/
 :Discussions to: `f2py-users mailing list`_
 :Documentation: `User's Guide`__, FAQ__
@@ -443,7 +443,6 @@ __ http://jrfonseca.dyndns.org/debian/
 .. _Numarray: http://www.stsci.edu/resources/software_hardware/numarray
 .. _docutils: http://docutils.sourceforge.net/
 .. _distutils: http://www.python.org/sigs/distutils-sig/
-.. _LGPL: http://www.fsf.org/copyleft/lesser.html
 .. _Numerical Python: http://www.numpy.org/
 .. _Pyfort: http://pyfortran.sourceforge.net/
 .. _Scientific Python: 
diff --git a/numpy/f2py/docs/THANKS.txt b/numpy/f2py/docs/THANKS.txt
index 737e17134..0a3f0b9d6 100644
--- a/numpy/f2py/docs/THANKS.txt
+++ b/numpy/f2py/docs/THANKS.txt
@@ -3,7 +3,7 @@
  Acknowledgments
 =================
 
-F2PY__ is a LGPL'd Python package and command line tool developed and
+F2PY__ is an open source Python package and command line tool developed and
 maintained by Pearu Peterson (me__). 
 
 .. __: http://cens.ioc.ee/projects/f2py2e/
diff --git a/numpy/f2py/f2py.1 b/numpy/f2py/f2py.1
index 5ca9a3ab5..b8769a0cc 100644
--- a/numpy/f2py/f2py.1
+++ b/numpy/f2py/f2py.1
@@ -204,6 +204,6 @@ Scipy website: http://www.numpy.org
 .SH COPYRIGHT
 Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
 .SH LICENSE
-LGPL (see http://www.fsf.org)
+NumPy License
 .SH VERSION
 2.45.241
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
index b8416c973..4f5963dff 100755
--- a/numpy/f2py/f2py2e.py
+++ b/numpy/f2py/f2py2e.py
@@ -7,7 +7,7 @@ f2py2e - Fortran to Python C/API generator. 2nd Edition.
 Copyright 1999--2005 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@cens.ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/05/06 08:31:19 $
diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py
index 9c0d54900..f345e67ed 100644
--- a/numpy/f2py/f90mod_rules.py
+++ b/numpy/f2py/f90mod_rules.py
@@ -6,7 +6,7 @@ Build F90 module support for f2py2e.
 Copyright 2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/02/03 19:30:23 $
diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py
index 4039c9996..1c543c74d 100644
--- a/numpy/f2py/func2subr.py
+++ b/numpy/f2py/func2subr.py
@@ -6,7 +6,7 @@ Rules for building C/API module with f2py2e.
 Copyright 1999,2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2004/11/26 11:13:06 $
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index 951dc272e..b72334343 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -44,7 +44,7 @@ wrapper_function(args)
 Copyright 1999,2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2005/08/30 08:58:42 $
diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
index 8c6a4a698..191639d5c 100755
--- a/numpy/f2py/setup.py
+++ b/numpy/f2py/setup.py
@@ -8,7 +8,7 @@ Usage:
 Copyright 2001-2005 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@cens.ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Revision: 1.32 $
@@ -79,7 +79,7 @@ if __name__ == "__main__":
             'Development Status :: 5 - Production/Stable',
             'Intended Audience :: Developers',
             'Intended Audience :: Science/Research',
-            'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+            'License :: OSI Approved :: NumPy License',
             'Natural Language :: English',
             'Operating System :: OS Independent',
             'Programming Language :: C',
@@ -94,7 +94,7 @@ if __name__ == "__main__":
           author_email      = "pearu@cens.ioc.ee",
           maintainer        = "Pearu Peterson",
           maintainer_email  = "pearu@cens.ioc.ee",
-          license           = "LGPL",
+          license           = "BSD",
           platforms         = "Unix, Windows (mingw|cygwin), Mac OSX",
           long_description  = """\
 The Fortran to Python Interface Generator, or F2PY for short, is a
diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py
index 8affcbe41..28a34091b 100644
--- a/numpy/f2py/use_rules.py
+++ b/numpy/f2py/use_rules.py
@@ -8,7 +8,7 @@ Unfinished.
 Copyright 2000 Pearu Peterson all rights reserved,
 Pearu Peterson <pearu@ioc.ee>          
 Permission to use, modify, and distribute this software is given under the
-terms of the LGPL.  See http://www.fsf.org
+terms of the NumPy License.
 
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 $Date: 2000/09/10 12:35:43 $