From: James A. <amu...@us...> - 2003-11-26 03:32:51
|
Update of /cvsroot/maxima/maxima In directory sc8-pr-cvs1:/tmp/cvs-serv3870 Modified Files: COPYING Makefile.am README maxima.spec.in Removed Files: COPYING1 Log Message: Moved DOE export notice as suggested by Dave Turner, the Free Software Foundation's ``GPL Compliance Engineer''. See the thread "Resolution of GPL Licensing Issue" from May 2003 for details. Index: COPYING =================================================================== RCS file: /cvsroot/maxima/maxima/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- COPYING 8 May 2000 06:09:41 -0000 1.1.1.1 +++ COPYING 26 Nov 2003 03:32:48 -0000 1.2 @@ -1,4 +1,22 @@ -` +Maxima is dedicated to the memory of William F. Schelter. On 6 October +1998 William F. Schelter was formally notified that he could distribute +DOE-MACSYMA upon terms of his choosing, in particular the GNU General +Public License: <http://www.ma.utexas.edu/users/wfs/maxima-doe-auth.gif> +Schelter proceed to distribute derived works under the GPL. + +In the formal notification a request was made that a paragraph "should +be included in the GPL and should accompany other modifications, +enhancements or derivative works of your program." This paragraph is +transcribed below in honor of that request. Like the preamble it does +not form part of the license. + +"Distribution of such derivative works is subject to the U.S. Export +Administration Regulations (Title 15 CFR 768-799), which implements the +Export Administration Act of 1979, as amended, and/or the International +Traffic in Arms Regulations, of 12-6-84, (Title 22 CFR 121-130), which +implements the Arms Export Control Act (22 U.S.C. 2728) and may require +license for export." + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Index: Makefile.am =================================================================== RCS file: /cvsroot/maxima/maxima/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 9 Feb 2003 22:59:03 -0000 1.13 +++ Makefile.am 26 Nov 2003 03:32:48 -0000 1.14 @@ -1,11 +1,11 @@ SUBDIRS = src lisp-utils tests doc interfaces share demo plotting -EXTRA_DIST = common.mk maxima-local xmaxima-local README.lisps COPYING1 maxima.iss.in README.rpms INSTALL.win32 +EXTRA_DIST = common.mk maxima-local xmaxima-local README.lisps maxima.iss.in README.rpms INSTALL.win32 include common.mk extradocinstall: test -d "$(docdir)" || mkdir -p "$(docdir)" - for file in AUTHORS COPYING COPYING1 INSTALL README README.lisps ; \ + for file in AUTHORS COPYING INSTALL README README.lisps ; \ do \ $(INSTALL_DATA) $$file "$(docdir)" ; \ done Index: README =================================================================== RCS file: /cvsroot/maxima/maxima/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README 7 Oct 2002 14:15:16 -0000 1.2 +++ README 26 Nov 2003 03:32:48 -0000 1.3 @@ -7,8 +7,8 @@ It comes with hundreds of self tests. Maxima is distributed under the GNU General Public License, with some -export restrictions from the U.S. Department of Energy. See the files -COPYING and COPYING1. +export restrictions from the U.S. Department of Energy. See the file +COPYING. Installation information is available in the file INSTALL. Summary information about this release can be found in the file NEWS. Detailed Index: maxima.spec.in =================================================================== RCS file: /cvsroot/maxima/maxima/maxima.spec.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- maxima.spec.in 22 Feb 2003 08:41:36 -0000 1.6 +++ maxima.spec.in 26 Nov 2003 03:32:48 -0000 1.7 @@ -114,7 +114,7 @@ %{_infodir}/* %{_mandir}/man1/maxima.1 %{_bindir}/maxima -%doc AUTHORS COPYING COPYING1 INSTALL README README.lisps README.rpms +%doc AUTHORS COPYING INSTALL README README.lisps README.rpms %files xmaxima %{_bindir}/xmaxima --- COPYING1 DELETED --- |