summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-05-24 21:30:58 (GMT)
committerlrknox <lrknox>2017-05-24 21:30:58 (GMT)
commit00d423af600be0377734f0d709c9d1055446a5c6 (patch)
treede2ef3b863fd8119b3ab57a378cd5e7df627719c /src
parent3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8 (diff)
downloadhdf5-00d423af600be0377734f0d709c9d1055446a5c6.zip
hdf5-00d423af600be0377734f0d709c9d1055446a5c6.tar.gz
hdf5-00d423af600be0377734f0d709c9d1055446a5c6.tar.bz2
Update text in COPYING files in subdirectories to match changes to
copyright notices in source files. Update Copyright notices in acsite.m4 and bin/yodconfigure that were overlooked by chkcopyright. Remove broken and unnecessary urls from comments in hl/fortran/src/H5IMcc.c and hl/src/H5IM.c. Commit bin/reconfigure changes to generated files.
Diffstat (limited to 'src')
-rw-r--r--src/COPYING11
-rw-r--r--src/H5detect.c10
-rw-r--r--src/H5err.txt10
-rw-r--r--src/H5make_libsettings.c10
-rw-r--r--src/H5overflow.txt10
-rw-r--r--src/H5vers.txt10
-rw-r--r--src/Makefile.in13
7 files changed, 24 insertions, 50 deletions
diff --git a/src/COPYING b/src/COPYING
index 6903daf..6497ace 100644
--- a/src/COPYING
+++ b/src/COPYING
@@ -5,12 +5,9 @@
The files and subdirectories in this directory are part of HDF5.
The full HDF5 copyright notice, including terms governing use,
- modification, and redistribution, is contained in the files COPYING
- and Copyright.html. COPYING can be found at the root of the source
- code distribution tree; Copyright.html can be found at the root
- level of an installed copy of the electronic HDF5 document set and
- is linked from the top-level documents page. It can also be found
- at http://www.hdfgroup.org/HDF5/doc/Copyright.html. If you do not
- have access to either file, you may request a copy from
+ modification, and redistribution, is contained in the COPYING file
+ which can be found at the root of the source code distribution tree
+ or in https://support.hdfgroup.org/ftp/HDF5/releases. If you do
+ not have access to either file, you may request a copy from
help@hdfgroup.org.
diff --git a/src/H5detect.c b/src/H5detect.c
index 8077c2f..2dae228 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -20,12 +20,10 @@ static const char *FileHeader = "\n\
* *\n\
* This file is part of HDF5. The full HDF5 copyright notice, including *\n\
* terms governing use, modification, and redistribution, is contained in *\n\
- * the files COPYING and Copyright.html. COPYING can be found at the root *\n\
- * of the source code distribution tree; Copyright.html can be found at the *\n\
- * root level of an installed copy of the electronic HDF5 document set and *\n\
- * is linked from the top-level documents page. It can also be found at *\n\
- * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *\n\
- * access to either file, you may request a copy from help@hdfgroup.org. *\n\
+ * the COPYING file, which can be found at the root of the source code *\n\
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *\n\
+ * If you do not have access to either file, you may request a copy from *\n\
+ * help@hdfgroup.org. *\n\
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *";
/*
*
diff --git a/src/H5err.txt b/src/H5err.txt
index e94014d..f0a60a1 100644
--- a/src/H5err.txt
+++ b/src/H5err.txt
@@ -4,12 +4,10 @@
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html. COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page. It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
#
# This file is used to generate the various headers that are needed for the
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index 7b76f2b..1892806 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -20,12 +20,10 @@ static const char *FileHeader = "\n\
* *\n\
* This file is part of HDF5. The full HDF5 copyright notice, including *\n\
* terms governing use, modification, and redistribution, is contained in *\n\
- * the files COPYING and Copyright.html. COPYING can be found at the root *\n\
- * of the source code distribution tree; Copyright.html can be found at the *\n\
- * root level of an installed copy of the electronic HDF5 document set and *\n\
- * is linked from the top-level documents page. It can also be found at *\n\
- * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *\n\
- * access to either file, you may request a copy from help@hdfgroup.org. *\n\
+ * the COPYING file, which can be found at the root of the source code *\n\
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *\n\
+ * If you do not have access to either file, you may request a copy from *\n\
+ * help@hdfgroup.org. *\n\
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *";
/*
*
diff --git a/src/H5overflow.txt b/src/H5overflow.txt
index c093fd5..636b2ef 100644
--- a/src/H5overflow.txt
+++ b/src/H5overflow.txt
@@ -4,12 +4,10 @@
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html. COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page. It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
#
# This file is used to generate the headers that is needed for detecting
diff --git a/src/H5vers.txt b/src/H5vers.txt
index 18a88d9..b32c34b 100644
--- a/src/H5vers.txt
+++ b/src/H5vers.txt
@@ -4,12 +4,10 @@
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html. COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page. It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
#
# This file is used to generate the various headers that are needed for
diff --git a/src/Makefile.in b/src/Makefile.in
index cfac5f3..f57a2f9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1669,19 +1669,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
help:
@$(top_srcdir)/bin/makehelp
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5. The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html. COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page. It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
# Number format detection
# The LD_LIBRARY_PATH setting is a kludge.
# Things should have been all set during H5detect making.