[netcdf] 02/08: Merge tag 'upstream/4.6.0'
Bas Couwenberg
sebastic at debian.org
Thu Jan 25 18:51:24 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository netcdf.
commit 1223d49bc219450ff3affc7fecf7118b101837d3
Merge: 1e93495 c449008
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jan 25 19:23:15 2018 +0100
Merge tag 'upstream/4.6.0'
Upstream version 4.6.0
.gitignore | 4 -
.travis.yml | 50 +-
CMakeLists.txt | 64 +-
Makefile.am | 94 +-
Makefile.in | 95 +-
RELEASE_NOTES.md | 10 +
cf | 45 +-
cf.cmake | 56 +-
config.h.cmake.in | 9 +
config.h.in | 21 +-
configure | 672 +-
configure.ac | 183 +-
dap4_test/Makefile.am | 14 +-
dap4_test/Makefile.in | 93 +-
dap4_test/test_data.c | 2 +
dap4_test/test_data.sh | 18 +-
dap4_test/test_meta.sh | 21 +-
dap4_test/test_parse.sh | 12 +-
dap4_test/test_raw.sh | 8 +-
dap4_test/tst_raw.sh | 2 -
docs/Doxyfile.developer | 2 +-
docs/Doxyfile.in | 17 +-
docs/FAQ.md | 6 +-
docs/Makefile.am | 14 +-
docs/Makefile.in | 19 +-
docs/all-error-codes.md | 6 +-
docs/auth.md | 36 +-
docs/cmake_faq.md | 69 -
docs/filters.md | 420 +
docs/guide.dox | 1 +
docs/images/Makefile.in | 5 +-
docs/install.md | 32 +-
docs/mainpage.dox | 4 +-
docs/old/netcdf-c.texi | 6 +-
docs/static-pages/software.html | 7354 ++--
docs/tutorial.dox | 11 +
docs/windows-binaries.md | 26 +-
examples/C/CMakeLists.txt | 10 +-
examples/C/Makefile.am | 49 +-
examples/C/Makefile.in | 367 +-
examples/C/filter_example.c | 309 +
examples/C/hdf5plugins/CMakeLists.txt | 37 +
examples/C/hdf5plugins/H5Zbzip2.c | 181 +
examples/C/hdf5plugins/Makefile.am | 28 +
{liblib => examples/C/hdf5plugins}/Makefile.in | 168 +-
examples/C/hdf5plugins/blocksort.c | 1094 +
examples/C/hdf5plugins/bzip2.nc | Bin 0 -> 11503 bytes
examples/C/hdf5plugins/bzlib.c | 1572 +
examples/C/hdf5plugins/bzlib.h | 282 +
examples/C/hdf5plugins/bzlib_private.h | 509 +
examples/C/hdf5plugins/compress.c | 672 +
examples/C/hdf5plugins/crctable.c | 104 +
examples/C/hdf5plugins/decompress.c | 646 +
examples/C/hdf5plugins/h5bzip2.h | 30 +
examples/C/hdf5plugins/huffman.c | 205 +
examples/C/hdf5plugins/randtable.c | 84 +
examples/C/run_examples.sh | 24 +
examples/C/run_examples4.sh | 39 +
examples/C/run_filter.sh | 29 +
examples/CDL/CMakeLists.txt | 11 +-
examples/CDL/Makefile.am | 16 +-
examples/CDL/Makefile.in | 64 +-
examples/CDL/create_sample_files.sh | 18 -
examples/CDL/do_comps.sh | 22 +
examples/CMakeLists.txt | 5 -
examples/Makefile.in | 5 +-
h5_test/CMakeLists.txt | 8 +-
h5_test/Makefile.am | 10 +-
h5_test/Makefile.in | 64 +-
h5_test/tst_h_atts3.c | 2 -
h5_test/tst_h_atts4.c | 2 -
h5_test/tst_h_dimscales.c | 10 +-
h5_test/tst_h_dimscales1.c | 45 +-
h5_test/tst_h_files.c | 3 +-
h5_test/tst_h_filters.c | 107 -
h5_test/tst_h_rd_cmp.c | 62 -
h5_test/tst_h_wrt_cmp.c | 125 +-
include/Makefile.am | 4 +-
include/Makefile.in | 17 +-
include/err_macros.h | 29 +-
include/nc.h | 5 +-
include/nc4dispatch.h | 6 +-
include/nc4internal.h | 18 +-
include/nc_tests.h | 25 +-
include/ncauth.h | 58 +
include/ncconfigure.h | 12 +
include/ncdispatch.h | 11 +-
include/ncfilter.h | 27 +
include/ncrc.h | 55 +-
include/netcdf.h | 681 +-
include/netcdf_par.h | 5 +-
include/rnd.h | 17 +-
lib_flags.am | 7 +-
libdap2/Makefile.in | 15 +-
libdap2/dapattr.c | 365 -
libdap2/dapcvt.c | 18 +-
libdap2/dapdump.c | 2 +-
libdap2/dapodom.c | 4 +-
libdap2/daputil.c | 19 +-
libdap2/ncd2dispatch.c | 107 +-
libdap2/ncd2dispatch.h | 9 +-
libdap2/test_vara.c | 4 +-
libdap4/CMakeLists.txt | 2 +-
libdap4/Makefile.am | 1 -
libdap4/Makefile.in | 41 +-
libdap4/d4chunk.c | 2 +-
libdap4/d4curlfunctions.c | 129 +-
libdap4/d4curlfunctions.h | 2 +-
libdap4/d4data.c | 1 -
libdap4/d4dump.c | 2 +-
libdap4/d4file.c | 79 +-
libdap4/d4http.c | 5 +-
libdap4/d4includes.h | 2 +
libdap4/d4meta.c | 22 +-
libdap4/d4odom.c | 4 +-
libdap4/d4parser.c | 19 +-
libdap4/d4rc.c | 666 -
libdap4/d4read.c | 59 +-
libdap4/d4swap.c | 2 +-
libdap4/d4util.c | 119 +-
libdap4/d4varx.c | 2 +-
libdap4/ncd4.h | 5 +-
libdap4/ncd4dispatch.c | 93 +-
libdap4/ncd4types.h | 65 +-
libdispatch/CMakeLists.txt | 4 +-
libdispatch/Makefile.am | 12 +-
libdispatch/Makefile.in | 64 +-
libdispatch/datt.c | 43 +-
libdispatch/dattget.c | 85 +-
libdispatch/dattinq.c | 225 +
libdispatch/dauth.c | 383 +
libdispatch/dcopy.c | 148 +-
libdispatch/ddim.c | 2 +-
libdispatch/ddispatch.c | 95 +-
libdispatch/derror.c | 27 +-
libdispatch/dfile.c | 1106 +-
libdispatch/dfilter.c | 237 +
libdispatch/dinternal.c | 6 +-
libdispatch/dparallel.c | 279 +-
libdispatch/drc.c | 611 +-
libdispatch/dstring.c | 58 +-
libdispatch/dtype.c | 17 +-
libdispatch/dutil.c | 254 +
libdispatch/dv2i.c | 613 +-
libdispatch/dvar.c | 491 +-
libdispatch/dvarget.c | 126 +-
libdispatch/dvarinq.c | 369 +-
libdispatch/dvarput.c | 29 +-
libdispatch/dwinpath.c | 2 -
libdispatch/nc.c | 3 +-
libdispatch/ncuri.c | 5 +-
libdispatch/test_pathcvt.c | 1 -
libdispatch/utf8proc.c | 3 +-
libdispatch/utf8proc.h | 24 +-
liblib/CMakeLists.txt | 8 +
liblib/Makefile.am | 8 +-
liblib/Makefile.in | 57 +-
libnetcdf.settings.in | 1 +
libsrc/Makefile.am | 9 +-
libsrc/Makefile.in | 44 +-
libsrc/attr.c | 2 -
libsrc/attr.m4 | 2 -
libsrc/dim.c | 5 -
libsrc/nc3dispatch.c | 19 +-
libsrc/nc3internal.c | 174 +-
libsrc/nc_hashmap.c | 23 +
libsrc/ncx.c | 37001 ++++++++++---------
libsrc/ncx.h | 21 +-
libsrc/ncx.m4 | 13 +-
libsrc/posixio.c | 3 -
libsrc/v1hpg.c | 28 +-
libsrc/var.c | 7 +-
libsrc4/Makefile.am | 12 +-
libsrc4/Makefile.in | 22 +-
libsrc4/nc3stub.c | 997 -
libsrc4/nc4attr.c | 736 +-
libsrc4/nc4dim.c | 176 +-
libsrc4/nc4dispatch.c | 13 +
libsrc4/nc4file.c | 3566 +-
libsrc4/nc4grp.c | 319 +-
libsrc4/nc4hdf.c | 6398 ++--
libsrc4/nc4info.c | 78 +-
libsrc4/nc4internal.c | 1216 +-
libsrc4/nc4type.c | 403 +-
libsrc4/nc4var.c | 1301 +-
libsrc4/ncfunc.c | 90 +-
libsrcp/Makefile.am | 5 -
libsrcp/Makefile.in | 23 +-
libsrcp/ncpdispatch.c | 13 +-
nc_test/CMakeLists.txt | 1 +
nc_test/Make0 | 11 +-
nc_test/Makefile.am | 63 +-
nc_test/Makefile.in | 236 +-
nc_test/large_files.c | 20 +-
nc_test/nc_enddef.c | 61 -
nc_test/nc_sync.c | 557 -
nc_test/nc_sync.h | 6 -
nc_test/nc_sync_child.c | 100 -
nc_test/nc_test.c | 10 +-
nc_test/quick_large_files.c | 1082 +-
nc_test/run_diskless.sh | 2 +-
nc_test/run_diskless2.sh | 3 +
nc_test/test_put.c | 3 +-
nc_test/test_put.m4 | 3 +-
nc_test/test_read.c | 6 +-
nc_test/test_read.m4 | 6 +-
nc_test/test_write.c | 2 +-
nc_test/test_write.m4 | 2 +-
nc_test/tst_atts3.c | 8 -
nc_test/tst_big_rvar.c | 7 +-
nc_test/tst_big_var2.c | 7 +-
nc_test/tst_big_var6.c | 6 +-
nc_test/tst_cdf5format.c | 354 +-
nc_test/tst_diskless.c | 3 +-
nc_test/tst_elatefill.c | 3 +-
nc_test/tst_formats.c | 159 +
nc_test/tst_global_fillval.c | 77 +-
nc_test/tst_inq_type.c | 266 +-
nc_test/tst_max_var_dims.c | 34 +
nc_test/tst_misc.c | 22 +
nc_test/tst_parallel2.c | 44 +-
nc_test/tst_utf8_phrases.c | 8 +-
nc_test/tst_utf8_validate.c | Bin 15275 -> 15268 bytes
nc_test/util.c | 13 +-
nc_test4/CMakeLists.txt | 51 +-
nc_test4/Make0 | 33 +-
nc_test4/Makefile.am | 149 +-
nc_test4/Makefile.in | 816 +-
nc_test4/bzip2.cdl | 83 +
nc_test4/filter_test/CMakeLists.txt | 34 +
nc_test4/filter_test/H5Zbzip2.c | 171 +
nc_test4/filter_test/H5Ztemplate.c | 104 +
nc_test4/filter_test/H5Ztest.c | 207 +
nc_test4/filter_test/Make0 | 38 +
nc_test4/filter_test/Makefile.am | 77 +
nc_test4/filter_test/blocksort.c | 1094 +
nc_test4/filter_test/bzlib.c | 1572 +
nc_test4/filter_test/bzlib.h | 282 +
nc_test4/filter_test/bzlib_private.h | 509 +
nc_test4/filter_test/compress.c | 672 +
nc_test4/filter_test/crctable.c | 104 +
nc_test4/filter_test/decompress.c | 646 +
nc_test4/filter_test/fake.c | 5 +
nc_test4/filter_test/h5bzip2.h | 12 +
nc_test4/filter_test/h5test.h | 18 +
nc_test4/filter_test/huffman.c | 205 +
nc_test4/filter_test/randtable.c | 84 +
nc_test4/filter_test/test_filter.c | 493 +
nc_test4/filter_test/test_misc.c | 414 +
nc_test4/filter_test/tst_filter.sh | 128 +
nc_test4/filtered.cdl | 88 +
nc_test4/findplugin.in | 99 +
nc_test4/h5testszip.c | 182 +
nc_test4/hdf5plugins/CMakeLists.txt | 37 +
nc_test4/hdf5plugins/H5Zbzip2.c | 181 +
nc_test4/hdf5plugins/H5Zmisc.c | 252 +
nc_test4/hdf5plugins/H5Ztemplate.c | 104 +
nc_test4/hdf5plugins/Makefile.am | 26 +
{liblib => nc_test4/hdf5plugins}/Makefile.in | 170 +-
nc_test4/hdf5plugins/blocksort.c | 1094 +
nc_test4/hdf5plugins/bzip2.nc | Bin 0 -> 11503 bytes
nc_test4/hdf5plugins/bzlib.c | 1572 +
nc_test4/hdf5plugins/bzlib.h | 282 +
nc_test4/hdf5plugins/bzlib_private.h | 509 +
nc_test4/hdf5plugins/compress.c | 672 +
nc_test4/hdf5plugins/crctable.c | 104 +
nc_test4/hdf5plugins/decompress.c | 646 +
nc_test4/hdf5plugins/h5bzip2.h | 30 +
nc_test4/hdf5plugins/h5misc.h | 34 +
nc_test4/hdf5plugins/huffman.c | 205 +
nc_test4/hdf5plugins/randtable.c | 84 +
nc_test4/ref_bzip2.c | 98 +
nc_test4/ref_szip.cdl | 85 +
nc_test4/ref_szip.h5 | Bin 0 -> 5588 bytes
nc_test4/renamegroup.c | 2 +-
nc_test4/run_get_hdf4_files.sh | 16 +-
nc_test4/run_par_test.sh | 1 +
nc_test4/test_filter.c | 306 +
nc_test4/test_filter_misc.c | 452 +
nc_test4/test_szip.c | 155 +
nc_test4/test_wrapper.in | 35 +
nc_test4/tst_atts1.c | 4 +-
{ncdump => nc_test4}/tst_bug324.c | 2 +-
nc_test4/tst_camrun.c | 12 -
nc_test4/tst_chunk_hdf4.c | 34 +-
nc_test4/tst_chunks.c | 41 +
nc_test4/tst_compounds.c | 8 +-
nc_test4/tst_converts.c | 67 +-
nc_test4/tst_create_files.c | 2 -
nc_test4/tst_dims3.c | 8 +-
nc_test4/tst_empty_vlen_unlim.c | 30 +-
nc_test4/tst_enums.c | 5 +
nc_test4/tst_files.c | 79 +-
nc_test4/tst_files4.c | 2 -
nc_test4/tst_files5.c | 2 +-
nc_test4/tst_fill_attr_vanish.c | 9 -
nc_test4/tst_fills2.c | 2 +-
nc_test4/tst_filter.sh | 146 +
nc_test4/tst_filterparser.c | 194 +
nc_test4/tst_formatx_hdf4.sh | 15 +-
nc_test4/tst_grps.c | 145 +-
nc_test4/tst_grps2.c | 4 +-
nc_test4/tst_h5_endians.c | 91 +-
nc_test4/tst_h_atts2.c | 127 -
nc_test4/tst_h_files3.c | 223 -
nc_test4/tst_h_scalar.c | 2 -
nc_test4/tst_h_strbug.c | 8 +-
nc_test4/tst_h_vl2.c | 4 +-
nc_test4/tst_hdf5_file_compat.c | 1 -
nc_test4/tst_interops.c | 4 -
nc_test4/tst_interops2.c | 11 +
nc_test4/tst_interops3.c | 55 +-
nc_test4/tst_interops5.c | 16 +-
nc_test4/tst_large.c | 28 +-
nc_test4/tst_large2.c | 6 +-
nc_test4/tst_large3.c | 6 +-
nc_test4/tst_large5.c | 2 -
nc_test4/tst_rehash.c | 14 +-
nc_test4/tst_rename.c | 539 +-
nc_test4/tst_simplerw_coll_r.c | 641 +-
nc_test4/tst_szip.sh | 29 +
nc_test4/tst_types.c | 666 +-
nc_test4/tst_vars.c | 37 +-
nc_test4/tst_vars2.c | 578 +-
nc_test4/tst_vars3.c | 27 +-
nc_test4/tst_xplatform2.c | 168 +-
nc_test4/unfiltered.cdl | 87 +
ncdap_test/Makefile.am | 16 +-
ncdap_test/Makefile.in | 121 +-
ncdap_test/expected3/Makefile.in | 5 +-
ncdap_test/expectremote3/Makefile.in | 5 +-
ncdap_test/t_dap.c | 15 +-
ncdap_test/t_dap3a.c | 16 +-
ncdap_test/t_dap3c.c | 6 +-
ncdap_test/t_dap4.c | 466 -
ncdap_test/t_dap4a.c | 937 -
ncdap_test/t_dap4c.c | 51 -
ncdap_test/test_cvt.c | 16 +-
ncdap_test/test_nstride_cached.c | 1 -
ncdap_test/test_partvar.c | 6 +-
ncdap_test/test_partvar2.c | 6 +-
ncdap_test/test_vara.c | 7 +-
ncdap_test/test_varm3.c | 4 +-
ncdap_test/testdata3/Makefile.in | 5 +-
ncdap_test/testurl.sh | 14 +-
ncdap_test/tst_ber.sh | 9 +-
ncdap_test/tst_formatx.sh | 8 +-
ncdap_test/tst_ncdap.sh | 4 +-
ncdap_test/tst_remote.sh | 3 +-
ncdap_test/tst_special.sh | 3 +-
ncdap_test/tst_tds.sh | 3 +-
ncdump/CMakeLists.txt | 108 +-
ncdump/L512.bin | 1 +
ncdump/Makefile.am | 236 +-
ncdump/Makefile.in | 741 +-
ncdump/bom.c | 4 +-
ncdump/cdl.h | 1 +
ncdump/cdl/Makefile.in | 5 +-
ncdump/ctest.c | 1472 -
ncdump/ctest64.c | 1472 -
ncdump/ctests.sh | 9 +-
ncdump/dumplib.c | 56 -
ncdump/dumplib.h | 5 -
ncdump/expected/Makefile.in | 5 +-
ncdump/indent.h | 6 +-
ncdump/isnan.h | 6 +-
ncdump/nccopy.1 | 25 +
ncdump/nccopy.c | 260 +-
ncdump/ncdump.c | 28 +-
ncdump/nctime0.h | 7 +-
ncdump/nctrunc.c | 1 -
ncdump/ocprint.c | 3 -
ncdump/ref_ctest.c | 2603 +-
ncdump/ref_ctest64.c | 2603 +-
ncdump/ref_null_byte_padding_test.nc | Bin 0 -> 1036 bytes
...st_360_day_1900.nc => ref_test_360_day_1900.nc} | Bin
...st_365_day_1900.nc => ref_test_365_day_1900.nc} | Bin
...st_366_day_1900.nc => ref_test_366_day_1900.nc} | Bin
ncdump/ref_test_corrupt_magic.nc | Bin 0 -> 6368 bytes
ncdump/ref_tst_nc4_utf8_4.cdl | 24 +
ncdump/run_ncgen_nc4_tests.sh | 15 +-
ncdump/run_ncgen_tests.sh | 13 +-
ncdump/run_utf8_nc4_tests.sh | 22 +-
ncdump/run_utf8_tests.sh | 48 +-
ncdump/test_corrupt_magic.cdl | 11 +
ncdump/tst_calendars.sh | 2 +-
ncdump/tst_compress.c | 2 +-
ncdump/tst_dimsizes.sh | 14 +-
ncdump/tst_fileinfo.sh | 6 +-
ncdump/tst_fillbug.c | 8 +-
ncdump/tst_fillbug.sh | 1 +
ncdump/tst_formatx3.sh | 26 +-
ncdump/tst_formatx4.sh | 18 +-
ncdump/tst_h_rdc0.c | 11 +-
ncdump/tst_h_scalar.c | 4 +-
ncdump/tst_h_scalar.sh | 1 +
ncdump/tst_hdf5_offset.sh | 45 +
ncdump/tst_inmemory_nc3.sh | 16 +-
ncdump/tst_inmemory_nc4.sh | 16 +-
ncdump/tst_nccopy3.sh | 33 +-
ncdump/tst_nccopy4.sh | 6 +-
ncdump/tst_ncgen4.sh | 17 +-
ncdump/tst_ncgen4_classic.sh | 11 +-
ncdump/tst_ncgen4_cycle.sh | 17 +-
ncdump/tst_ncgen4_diff.sh | 6 +-
ncdump/tst_ncgen_shared.sh | 5 +-
ncdump/tst_netcdf4.sh | 151 +-
ncdump/tst_netcdf4_4.sh | 10 +-
ncdump/tst_null_byte_padding.sh | 17 +
ncdump/tst_output.sh | 58 +-
ncdump/tst_string_data.c | 2 +-
ncdump/utils.h | 5 +
ncdump/vardata.c | 2 -
ncdump/vardata.h | 6 +-
ncgen/Makefile.am | 2 +
ncgen/Makefile.in | 14 +-
ncgen/cvt.c | 20 +-
ncgen/genbin.c | 27 +
ncgen/genc.c | 56 +
ncgen/genlib.h | 2 +-
ncgen/includes.h | 1 -
ncgen/main.c | 12 +-
ncgen/makeparser.sh | 8 +
ncgen/nc_iter.h | 6 +-
ncgen/ncgen.h | 19 +-
ncgen/ncgen.l | 10 +-
ncgen/ncgen.y | 50 +-
ncgen/ncgenl.c | 2098 +-
ncgen/ncgeny.c | 1351 +-
ncgen/ncgeny.h | 86 +-
ncgen3/Makefile.in | 16 +-
ncgen3/genlib.c | 55 -
ncgen3/genlib.h | 5 -
ncgen3/load.c | 4 -
ncgen3/main.c | 1 -
nctest/CMakeLists.txt | 2 +
nctest/Makefile.am | 11 +-
nctest/Makefile.in | 61 +-
nctest/driver.c | 227 +-
oc2/CMakeLists.txt | 5 +-
oc2/Makefile.am | 6 +-
oc2/Makefile.in | 38 +-
oc2/daplex.c | 22 +-
oc2/oc.c | 130 +-
oc2/occlientparams.c | 29 -
oc2/occlientparams.h | 11 -
oc2/occurlfunctions.c | 274 +-
oc2/occurlfunctions.h | 2 +-
oc2/ocdump.c | 50 +-
oc2/ochttp.c | 24 +-
oc2/ochttp.h | 2 +-
oc2/ocinternal.c | 188 +-
oc2/ocinternal.h | 62 +-
oc2/ocnode.c | 23 +-
oc2/ocrc.c | 809 -
oc2/ocread.c | 63 +-
oc2/ocutil.c | 52 +-
oc2/xxdr.c | 2 +-
test-driver-verbose | 35 +-
test_common.in | 22 +-
460 files changed, 68705 insertions(+), 49685 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git
More information about the Pkg-grass-devel
mailing list