[netcdf] 02/07: Merge tag 'upstream/4.6.1'

Bas Couwenberg sebastic at debian.org
Tue Mar 20 06:53:05 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 6184d1ccfc1293efbde0ca6dd43713154aa70b37
Merge: e9b1dec 2cfdf3d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 20 07:23:32 2018 +0100

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1

 .github/CODEOWNERS                            |    9 +
 .gitignore                                    |    1 -
 CMakeLists.txt                                |  246 +--
 CODE_OF_CONDUCT.md                            |   46 +
 Makefile.am                                   |   42 +-
 Makefile.in                                   |   59 +-
 RELEASE_NOTES.md                              |    8 +-
 aclocal.m4                                    |  191 +--
 cf                                            |    7 +-
 cf.cmake                                      |    7 +-
 compile                                       |    8 +-
 config.guess                                  |  559 +++----
 config.h.cmake.in                             |  159 +-
 config.h.cmake.in.old-works                   |   50 -
 config.h.in                                   |  113 +-
 config.sub                                    |  249 ++-
 configure                                     | 1266 +++------------
 configure.ac                                  |  149 +-
 dap4_test/Makefile.in                         |   74 +-
 depcomp                                       |    8 +-
 docs/Doxyfile.developer                       |    2 +-
 docs/Makefile.am                              |    2 +-
 docs/Makefile.in                              |   20 +-
 docs/filters.md                               |   34 +-
 docs/images/Makefile.in                       |   16 +-
 docs/indexing.dox                             |  218 +++
 docs/windows-binaries.md                      |   26 +-
 examples/C/Makefile.am                        |   14 +-
 examples/C/Makefile.in                        |  139 +-
 examples/C/filter_example.c                   |    2 +-
 examples/C/hdf5plugins/.gitignore             |   11 +
 examples/C/hdf5plugins/CMakeLists.txt         |    6 -
 examples/C/hdf5plugins/H5Zbzip2.c             |  181 ---
 examples/C/hdf5plugins/Makefile.am            |    2 +-
 examples/C/hdf5plugins/Makefile.in            |   71 +-
 examples/C/hdf5plugins/blocksort.c            | 1094 -------------
 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_nc4_valgrind_tests.sh          |   24 -
 examples/C/run_valgrind_tests.sh              |   24 -
 examples/CDL/Makefile.in                      |   18 +-
 examples/Makefile.in                          |   18 +-
 h5_test/Makefile.am                           |   13 +-
 h5_test/Makefile.in                           |  191 ++-
 h5_test/run_valgrind_tests.sh                 |   29 -
 hdf4_test/CMakeLists.txt                      |   16 +
 hdf4_test/Makefile.am                         |   37 +
 {nctest => hdf4_test}/Makefile.in             |  262 ++--
 {nc_test4 => hdf4_test}/ref_chunked.hdf4      |  Bin
 {nc_test4 => hdf4_test}/ref_contiguous.hdf4   |  Bin
 hdf4_test/run_formatx_hdf4.sh                 |   51 +
 {nc_test4 => hdf4_test}/run_get_hdf4_files.sh |    2 +-
 {nc_test4 => hdf4_test}/tst_chunk_hdf4.c      |    0
 {nc_test4 => hdf4_test}/tst_h4_lendian.c      |    1 -
 {nc_test4 => hdf4_test}/tst_interops2.c       |    2 +-
 {nc_test4 => hdf4_test}/tst_interops3.c       |    1 -
 include/Makefile.am                           |   14 +-
 include/Makefile.in                           |   23 +-
 include/hdf4dispatch.h                        |  276 ++++
 include/nc3dispatch.h                         |    5 +-
 include/nc3internal.h                         |   32 +-
 include/nc4internal.h                         |    1 +
 include/nc_tests.h                            |    1 +
 include/ncdispatch.h                          |   10 +-
 include/nchashmap.h                           |  113 +-
 include/nclist.h                              |   16 +-
 include/nclistmap.h                           |  100 ++
 include/netcdf.h                              |    7 +-
 include/netcdf_meta.h.in                      |    2 +-
 include/onstack.h                             |    2 +-
 install-sh                                    |   45 +-
 libdap2/Makefile.in                           |  126 +-
 libdap2/dapdump.c                             |    4 +-
 libdap2/dapincludes.h                         |    1 -
 libdap2/ncd2dispatch.c                        |   21 +-
 libdap2/ncd2dispatch.h                        |    6 +-
 libdap4/Makefile.in                           |  156 +-
 libdap4/d4chunk.c                             |    2 +-
 libdap4/d4curlfunctions.c                     |    6 +-
 libdap4/d4varx.c                              |    2 +-
 libdap4/ncd4dispatch.c                        |    2 +-
 libdispatch/Makefile.in                       |  277 +++-
 libdispatch/ddim.c                            |    3 +-
 libdispatch/derror.c                          |    2 +
 libdispatch/dfile.c                           |  148 +-
 libdispatch/dfilter.c                         |    2 +-
 libdispatch/drc.c                             |   55 +-
 libdispatch/dvar.c                            |  209 +--
 libdispatch/ncbytes.c                         |    6 +-
 libdispatch/nchashmap.c                       | 2094 +++++++++++++++++++++++--
 libdispatch/nclist.c                          |   41 +-
 libdispatch/nclistmgr.c                       |    5 +
 libhdf4/CMakeLists.txt                        |   17 +
 libhdf4/Makefile.am                           |   25 +
 {libsrcp => libhdf4}/Makefile.in              |  130 +-
 libhdf4/hdf4attr.c                            |   69 +
 libhdf4/hdf4dim.c                             |   44 +
 libhdf4/hdf4dispatch.c                        |  134 ++
 libhdf4/hdf4file.c                            |  713 +++++++++
 libsrc4/ncfunc.c => libhdf4/hdf4func.c        |   63 +-
 libhdf4/hdf4grp.c                             |   53 +
 libhdf4/hdf4type.c                            |  309 ++++
 libhdf4/hdf4var.c                             |  379 +++++
 liblib/CMakeLists.txt                         |    4 +
 liblib/Makefile.am                            |    8 +-
 liblib/Makefile.in                            |   68 +-
 liblib/nc_initialize.c                        |    8 +
 libnetcdf.settings.in                         |    2 +-
 libsrc/CMakeLists.txt                         |    1 +
 libsrc/Makefile.in                            |  134 +-
 libsrc/attr.c                                 | 1396 +++++++++--------
 libsrc/attr.m4                                |   30 +-
 libsrc/nc3dispatch.c                          |   12 +-
 libsrc/nc3internal.c                          |  120 +-
 libsrc/posixio.c                              |    4 -
 libsrc/putget.c                               |    4 -
 libsrc/putget.m4                              |    4 -
 libsrc/v1hpg.c                                |   28 +-
 libsrc/var.c                                  |  115 +-
 libsrc4/Makefile.in                           |  111 +-
 libsrc4/nc4attr.c                             | 1055 ++++++-------
 libsrc4/nc4dim.c                              |  211 +--
 libsrc4/nc4dispatch.c                         |    4 +-
 libsrc4/nc4file.c                             |  558 +------
 libsrc4/nc4grp.c                              |    4 +-
 libsrc4/nc4hdf.c                              |   99 +-
 libsrc4/nc4internal.c                         |   32 +-
 libsrc4/nc4var.c                              |  121 +-
 libsrc4/ncfunc.c                              |   14 +-
 libsrcp/Makefile.in                           |   51 +-
 libsrcp/ncpdispatch.c                         |   19 +-
 missing                                       |   14 +-
 nc_test/CMakeLists.txt                        |    2 +-
 nc_test/Makefile.am                           |   38 +-
 nc_test/Makefile.in                           |  397 +++--
 nc_test/bad_cdf5_begin.nc                     |  Bin 0 -> 220 bytes
 nc_test/run_cdf5.sh                           |    6 +
 nc_test/run_valgrind_tests.sh                 |   29 -
 nc_test/test_write.c                          |   17 +
 nc_test/test_write.m4                         |   17 +
 nc_test/tst_cdf5_begin.c                      |   56 +
 nc_test/tst_def_var_fill.c                    |  151 ++
 nc_test/tst_meta.c                            |    7 +
 nc_test/tst_names.c                           |   15 +-
 nc_test/tst_open_cdf5.c                       |   25 +
 nc_test/util.c                                |    4 -
 nc_test4/CMakeLists.txt                       |   21 +-
 nc_test4/Makefile.am                          |   72 +-
 nc_test4/Makefile.in                          |  718 +++++----
 nc_test4/hdf5plugins/CMakeLists.txt           |   13 +-
 nc_test4/hdf5plugins/H5Zmisc.c                |   11 +-
 nc_test4/hdf5plugins/Makefile.am              |    4 +-
 nc_test4/hdf5plugins/Makefile.in              |   77 +-
 nc_test4/run_chunk_hdf4.sh                    |   26 -
 nc_test4/run_hdf4_valgrind_tests.sh           |   25 -
 nc_test4/run_valgrind_tests.sh                |   32 -
 nc_test4/run_valgrind_tests2.sh               |   23 -
 nc_test4/test_filter_misc.c                   |    7 +-
 nc_test4/tst_atts.c                           |  357 ++++-
 nc_test4/tst_atts2.c                          |   13 +-
 nc_test4/tst_chunks.c                         |  120 +-
 nc_test4/tst_dims.c                           |  430 +++--
 nc_test4/tst_filter.sh                        |   83 +-
 nc_test4/tst_filterparser.c                   |    9 +-
 nc_test4/tst_formatx_hdf4.sh                  |   32 -
 nc_test4/tst_grps.c                           |    6 +-
 nc_test4/tst_h5_endians.c                     |    4 +-
 nc_test4/tst_hdf4_read_var.sh                 |   27 -
 nc_test4/tst_nc_test_file.c                   |   33 -
 nc_test4/tst_put_vars_two_unlim_dim.c         |    1 +
 nc_test4/tst_rehash.c                         |    3 +-
 nc_test4/tst_rename.c                         |  147 +-
 nc_test4/tst_rename2.c                        |  140 ++
 nc_test4/tst_strings.c                        |  219 ++-
 nc_test4/tst_types.c                          |    2 +-
 nc_test4/tst_vars.c                           |   73 +-
 nc_test4/tst_vars2.c                          |  205 ++-
 ncdap_test/Makefile.in                        |  100 +-
 ncdap_test/expected3/Makefile.in              |   16 +-
 ncdap_test/expectremote3/Makefile.in          |   16 +-
 ncdap_test/testdata3/Makefile.in              |   16 +-
 ncdump/Makefile.am                            |    4 +
 ncdump/Makefile.in                            |  228 ++-
 ncdump/cdl/Makefile.in                        |   16 +-
 ncdump/expected/Makefile.in                   |   16 +-
 ncdump/nccopy.c                               |  167 +-
 ncgen/Makefile.in                             |  144 +-
 ncgen/genbin.c                                |    4 +-
 ncgen/genlib.c                                |    2 +
 ncgen/ncgen.y                                 |   18 +-
 ncgen/ncgeny.c                                |  618 ++++----
 ncgen/ncgeny.h                                |    2 +-
 ncgen3/Makefile.in                            |   87 +-
 nctest/Makefile.am                            |    8 +-
 nctest/Makefile.in                            |  146 +-
 nctest/run_valgrind_tests.sh                  |   28 -
 oc2/Makefile.in                               |  124 +-
 test-driver                                   |    8 +-
 test_common.in                                |    4 +-
 206 files changed, 12461 insertions(+), 12872 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