merge copyright into the README

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalInterp/trunk@124 df1f8a13-aa1d-4dd4-9681-27ded5b42416

2 files changed, 22 insertions, 23 deletions

diff --git a/src/GeneralizedPolynomial-Uniform/COPYRIGHT b/src/GeneralizedPolynomial-Uniform/COPYRIGHT
deleted file mode 100644
index 7253669..0000000
--- a/src/GeneralizedPolynomial-Uniform/COPYRIGHT
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2001-2002, Jonathan Thornburg <jthorn@aei.mpg.de>
-$Header$
-
-This interpolator (the code in this directory and its subdirectories)
-is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/GeneralizedPolynomial-Uniform/README b/src/GeneralizedPolynomial-Uniform/README
index 589fea7..0963854 100644
--- a/src/GeneralizedPolynomial-Uniform/README
+++ b/src/GeneralizedPolynomial-Uniform/README
@@ -5,12 +5,6 @@ This directory contains the interpolator registered for
 under the name
    "generalized polynomial interpolation"
 
-This interpolator is distributed under the GNU GPL; see the file COPYRIGHT
-for details.  Note that this means that if you distribute any program
-using this interpolator, you must provide source code to the entire
-program!
-
-
 
 The source code files are as follows:
 * startup.c registers the interpolation operator
@@ -71,3 +65,25 @@ test_molecule_posn
 	This makes a standalone test driver for the
 	   LocalInterp_molecule_posn()
 	function defined in molecule_posn.c
+
+
+Copyright
+=========
+
+This interpolator is copyright (C) 2002-2003
+by Jonathan Thornburg <jthorn@aei.mpg.de>.
+
+This interpolator is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This interpolator is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this thorn (see the file COPYING in this directory);
+if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA  02111-1307  USA