diff --git a/Makefile b/Makefile
index 0977e8dac9bbf195bb372052ee39ba45b63b7528..e57c5f6a976869603c914aba278e83b06700669b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $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
diff --git a/README b/README
index c5fc20b2343d2e04042678e32e68cb48bfadb14d..6fcf36918eacb34d7d5350766eb2e2d61bba3e6a 100644
--- a/README
+++ b/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/.
diff --git a/doc/FAQ b/doc/FAQ
index da5a59029756b0c8c6aa05068f68b66b38fc7baa..9003155e94446069646a86aa54540fae46d765ef 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-$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?
diff --git a/doc/COPYING b/doc/LICENSE
similarity index 100%
rename from doc/COPYING
rename to doc/LICENSE
diff --git a/gmsh.spec b/gmsh.spec
index 3509d4ef8c0f090183d9287ff82c8a05b54b4b60..8bfdc5211846eb23939123efe0a5cee7c77f86d6 100644
--- a/gmsh.spec
+++ b/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*
diff --git a/utils/commercial/COPYING b/utils/commercial/LICENSE
similarity index 99%
rename from utils/commercial/COPYING
rename to utils/commercial/LICENSE
index c8dd16fcfee852bbd5be2807a5936604e693fdca..cb23498a6ac95d629ceb30d25571c76ab2e1cf43 100644
--- a/utils/commercial/COPYING
+++ b/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
----------------------
diff --git a/utils/commercial/License.cpp b/utils/commercial/License.cpp
index 3fc59f6e7ad246d5ccebf35c2d32a62a6565489a..ff58af80ea2798439d6b9422e737216ea5992617 100644
--- a/utils/commercial/License.cpp
+++ b/utils/commercial/License.cpp
@@ -1,4 +1,4 @@
-// $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.");
}
diff --git a/utils/commercial/README b/utils/commercial/README
index 885203c1fda462cd4005112f7c2cf3e684c1cb92..1e1cc95be7e19b8a812f4a78717348477d2dc307 100644
--- a/utils/commercial/README
+++ b/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
diff --git a/utils/commercial/README.first b/utils/commercial/README.first
index b6099a50e0ded90a4c1b36265ed480097e8a6db7..af53e6fef7fd7dc14d4960081003ad999800a3c6 100644
--- a/utils/commercial/README.first
+++ b/utils/commercial/README.first
@@ -1,7 +1,7 @@
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"
diff --git a/utils/commercial/copying.texi b/utils/commercial/copying.texi
index 4471ee8ec394f6e81470c78090ce250973f96d10..0145cd7ce46fbb0ae4921c65ec9eb3615d4ce846 100644
--- a/utils/commercial/copying.texi
+++ b/utils/commercial/copying.texi
@@ -1,5 +1,5 @@
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}.
diff --git a/utils/commercial/license.texi b/utils/commercial/license.texi
index ebde0317d72cbc3fc430025b3032ea10593cba78..70a70e17d1a56f8f9786b09d34b115d8d5497cc7 100644
--- a/utils/commercial/license.texi
+++ b/utils/commercial/license.texi
@@ -1,2 +1,2 @@
-@verbatiminclude ../COPYING
+@verbatiminclude ../LICENSE
diff --git a/utils/commercial/sanitize.sh b/utils/commercial/sanitize.sh
index 2e1145adde11015fba9eda9ae102322f1682e191..d328daab1470689308a899528f559a0a9a0dee25 100644
--- a/utils/commercial/sanitize.sh
+++ b/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