COPYING -> LICENSE

Makefile

-# $Id: Makefile,v 1.303 2003-10-29 23:25:59 geuzaine Exp $
+# $Id: Makefile,v 1.304 2003-10-30 02:00:01 geuzaine Exp $
 #
 # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 #
@@ -79,7 +79,7 @@ source-nonfree: source-common
            Triangle/triangle.* TODO doc/gmsh.html doc/FAQ doc/README.cvs\
            utils/commercial
 	cp -f utils/commercial/README gmsh-${GMSH_RELEASE}/README
-	cp -f utils/commercial/COPYING gmsh-${GMSH_RELEASE}/doc/COPYING
+	cp -f utils/commercial/LICENSE gmsh-${GMSH_RELEASE}/doc/LICENSE
 	cp -f utils/commercial/License.cpp gmsh-${GMSH_RELEASE}/Common/License.cpp
 	cp -f utils/commercial/license.texi gmsh-${GMSH_RELEASE}/doc/texinfo/license.texi
 	cp -f utils/commercial/copying.texi gmsh-${GMSH_RELEASE}/doc/texinfo/copying.texi
@@ -178,7 +178,7 @@ package-unix:
 	mkdir gmsh-${GMSH_RELEASE}
 	strip bin/gmsh
 	cp bin/gmsh gmsh-${GMSH_RELEASE}
-	cp doc/gmsh.1 doc/COPYING doc/VERSIONS doc/FAQ doc/CREDITS gmsh-${GMSH_RELEASE}
+	cp doc/gmsh.1 doc/LICENSE doc/VERSIONS doc/FAQ doc/CREDITS gmsh-${GMSH_RELEASE}
 	cp -R tutorial gmsh-${GMSH_RELEASE}
 	cp -R demos gmsh-${GMSH_RELEASE}
 	rm -rf gmsh-${GMSH_RELEASE}/*/CVS
@@ -198,7 +198,7 @@ package-win:
 	cp doc/VERSIONS gmsh-${GMSH_RELEASE}/VERSIONS.txt
 	cp doc/FAQ gmsh-${GMSH_RELEASE}/FAQ.txt
 	cp doc/CREDITS gmsh-${GMSH_RELEASE}/CREDITS.txt
-	cp doc/COPYING gmsh-${GMSH_RELEASE}/COPYING.txt
+	cp doc/LICENSE gmsh-${GMSH_RELEASE}/LICENSE.txt
 	cd utils/misc && unix2dos.bash ../../gmsh-${GMSH_RELEASE}/*.txt
 	cp -R tutorial gmsh-${GMSH_RELEASE}
 	cp -R demos gmsh-${GMSH_RELEASE}
@@ -242,7 +242,7 @@ package-mac:
 	cp doc/VERSIONS gmsh-${GMSH_RELEASE}/VERSIONS.txt
 	cp doc/FAQ gmsh-${GMSH_RELEASE}/FAQ.txt
 	cp doc/CREDITS gmsh-${GMSH_RELEASE}/CREDITS.txt
-	cp doc/COPYING gmsh-${GMSH_RELEASE}/COPYING.txt
+	cp doc/LICENSE gmsh-${GMSH_RELEASE}/LICENSE.txt
 	rm -rf gmsh-${GMSH_RELEASE}/*/CVS\
                gmsh-${GMSH_RELEASE}/*/*~\
                gmsh-${GMSH_RELEASE}/*/*.msh

README

@@ -29,7 +29,7 @@ For a description of all other configuration options, type
 ./configure --help
 
 Gmsh is distributed under the terms of the GNU General Public
-License. See doc/COPYING and doc/CREDITS for more information.
+License. See doc/LICENSE and doc/CREDITS for more information.
 
 See the doc/ and tutorial/ directories for documentation. The
 reference manual is located in doc/texinfo/.

doc/FAQ

-$Id: FAQ,v 1.30 2003-04-21 22:29:09 geuzaine Exp $
+$Id: FAQ,v 1.31 2003-10-30 02:00:01 geuzaine Exp $
 
 This is the Gmsh FAQ
 
@@ -19,7 +19,7 @@ adapted meshes on lines, surfaces and volumes.
 * 1.2 What are the terms and conditions of use?
 
 Gmsh is distributed under the terms of the GNU General Public
-License. See the file doc/COPYING for more information, or go to the
+License. See the file doc/LICENSE for more information, or go to the
 GNU foundation's web site at http://www.gnu.org.
 
 * 1.3 What does 'Gmsh' mean?

gmsh.spec

@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc doc/COPYING doc/VERSIONS doc/FAQ doc/CREDITS demos tutorial
+%doc doc/LICENSE doc/VERSIONS doc/FAQ doc/CREDITS demos tutorial
 /usr/bin/gmsh
 /usr/bin/dxf2geo
 /usr/share/man/man1/gmsh*

utils/commercial/COPYING → utils/commercial/LICENSE

@@ -46,7 +46,7 @@ software to perform any functions which the BUYER deems desirable.
 The source code as so modified, shall nonetheless, remain subject to
 the same restrictions on use, reproduction, transmission, disclosure,
 translation and access as are contained in the AGREEMENT with respect
-to SOFTWARE for a period of 5 years.
+to SOFTWARE for a period of 3 years.
 
 2. ERRORS AND WARRANTY
 ----------------------

utils/commercial/License.cpp

-// $Id: License.cpp,v 1.3 2003-10-29 20:31:40 geuzaine Exp $
+// $Id: License.cpp,v 1.4 2003-10-30 02:00:01 geuzaine Exp $
 //
 // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
 //
@@ -9,5 +9,5 @@
 void print_license(void)
 {
   Msg(DIRECT, "The precise licensing conditions for this version of Gmsh can be");
-  Msg(DIRECT, "found in the 'doc/COPYING' file that accompanies the source code.");
+  Msg(DIRECT, "found in the 'doc/LICENSE' file that accompanies the source code.");
 }

utils/commercial/README

@@ -24,7 +24,7 @@ For a description of all other configuration options, type
 
 ./configure --help
 
-See doc/COPYING and doc/CREDITS for licensing and copyright
+See doc/LICENSE and doc/CREDITS for licensing and copyright
 information.
 
 See the doc/ and tutorial/ directories for documentation. The

utils/commercial/README.first

 To distribute Gmsh under another license:
 
-1) Put the license in the COPYING file (in this directory, i.e.
-   in utils/commercial/COPYING)
+1) Put the license in the LICENSE file (in this directory, i.e.
+   in utils/commercial/LICENSE)
 
 2) go to the base directory and "make source-nonfree"
 

utils/commercial/copying.texi

 The precise licensing conditions for this version of Gmsh can be found in
-the @file{doc/COPYING} file that accompanies the source code
+the @file{doc/LICENSE} file that accompanies the source code
 (@pxref{License}). Detailed copyright information can be found in
 @ref{Credits}.
 

utils/commercial/license.texi

 
-@verbatiminclude ../COPYING
+@verbatiminclude ../LICENSE

utils/commercial/sanitize.sh

@@ -21,22 +21,22 @@ for A in $files; do
       -e '/\/\/ Copyright (C).*Remacle/a\
 //\
 // This software is provided "as is" without express or implied warranty.\
-// See the file "COPYING" for the licensing terms.'\
+// See the file "doc/LICENSE" for the licensing terms.'\
       -e "/# This program is free software; you can redistribute/,/USA./D"\
       -e '/# Copyright (C).*Remacle/a\
 #\
 # This software is provided "as is" without express or implied warranty.\
-# See the file "COPYING" for the licensing terms.'\
+# See the file "doc/LICENSE" for the licensing terms.'\
       -e "/@c This program is free software; you can redistribute/,/USA./D"\
       -e '/@c Copyright (C).*Remacle/a\
 @c\
 @c This software is provided "as is" without express or implied warranty.\
-@c See the file "COPYING" for the licensing terms.'\
+@c See the file "doc/LICENSE" for the licensing terms.'\
       -e "/dnl This program is free software; you can redistribute/,/USA./D"\
       -e '/dnl Copyright (C).*Remacle/a\
 dnl\
 dnl This software is provided "as is" without express or implied warranty.\
-dnl See the file "COPYING" for the licensing terms.'\
+dnl See the file "doc/LICENSE" for the licensing terms.'\
   $A.old > $A
   rm -f $A.old
 done