diff options
author | lrknox <lrknox> | 2017-05-24 21:30:58 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2017-05-24 21:30:58 (GMT) |
commit | 00d423af600be0377734f0d709c9d1055446a5c6 (patch) | |
tree | de2ef3b863fd8119b3ab57a378cd5e7df627719c /hl/fortran | |
parent | 3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8 (diff) | |
download | hdf5-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 'hl/fortran')
-rw-r--r-- | hl/fortran/COPYING | 11 | ||||
-rw-r--r-- | hl/fortran/examples/CMakeTests.cmake | 11 | ||||
-rw-r--r-- | hl/fortran/src/H5IMcc.c | 3 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 13 | ||||
-rw-r--r-- | hl/fortran/test/CMakeTests.cmake | 11 |
5 files changed, 26 insertions, 23 deletions
diff --git a/hl/fortran/COPYING b/hl/fortran/COPYING index 6903daf..6497ace 100644 --- a/hl/fortran/COPYING +++ b/hl/fortran/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/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake index 032190b..97b2dbb 100644 --- a/hl/fortran/examples/CMakeTests.cmake +++ b/hl/fortran/examples/CMakeTests.cmake @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# 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 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/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index 77d2c02..639c27e 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -312,7 +312,6 @@ out: * the FORTRAN interface where the image buffer is defined as type "integer" * * based on HDF5 Image and Palette Specification - * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: * @@ -406,7 +405,6 @@ herr_t H5IMmake_palettef(hid_t loc_id, * the FORTRAN interface where the image buffer is defined as type "integer" * * based on HDF5 Image and Palette Specification - * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: * @@ -449,7 +447,6 @@ herr_t H5IMget_palettef(hid_t loc_id, * * Comments: * based on HDF5 Image and Palette Specification - * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: * diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 76bf11b..b78190d 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -1246,19 +1246,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local 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. - # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules # for them explicitly rather than trying to teach automake about them. diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake index 0895942..0edbbb3 100644 --- a/hl/fortran/test/CMakeTests.cmake +++ b/hl/fortran/test/CMakeTests.cmake @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# 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 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. + ############################################################################## ############################################################################## |