This is an automated email from the git hooks/post-receive script. nschloe-guest pushed a commit to branch split-c-f-cxx in repository netcdf.
commit 4a259abb2e8154171ac51cc826ce9403f0221b29 Merge: ac3254a 6360c6d Author: Nico Schlömer <nico.schloe...@gmail.com> Date: Tue May 20 12:06:10 2014 +0200 Merge branch 'upstream' into split-c-f-cxx CMakeLists.txt | 54 +- Doxyfile | 1934 + Make0 | 18 + Makefile.in | 1075 - RELEASE_NOTES.md | 8 + aclocal.m4 | 1191 - autom4te.cache/output.0 | 9959 + autom4te.cache/requests | 77 + autom4te.cache/traces.0 | 939 + cf | 189 + compile | 347 - config.guess | 1568 - config.h.in | 508 - config.sub | 1793 - configure | 13612 +- configure.ac | 5 +- depcomp | 791 - dods.m4 | 603 + examples/C/Makefile.in | 1169 - examples/C/file.c | 109 + examples/C/format.c | 82 + examples/C/large_files.c | 156 + examples/C/met4D.c | 281 + examples/C/quick_large_files.c | 77 + examples/C/quick_small_files.c | 78 + examples/C/sfc_pres_temp_more.c | 156 + examples/C/simple.c | 74 + examples/CDL/Makefile.in | 844 - examples/Makefile.in | 635 - h5_test/Makefile.in | 1462 - h5_test/tst_h_filters.c | 107 + include/Makefile.in | 583 - install-sh | 527 - libdap2/Make0 | 265 + libdap2/Makefile.in | 817 - libdap2/common.c | 20 + libdap2/cvt | 35 + libdap2/dcelex.c | 2 +- libdap2/env | 127 + libdap2/main.c | 199 + libdap2/ncdap.c | 42 + libdap2/ncdapa.c | 23 + libdap2/obsolete/cdf4.c | 519 + libdap2/obsolete/constraints4.c | 180 + libdap2/obsolete/constraints4.h | 17 + libdap2/obsolete/getvara4.c | 898 + libdap2/obsolete/ncdap4.c | 877 + libdap2/obsolete/ncdap4.h | 94 + libdap2/obsolete/stubdap4.c | 25 + libdap2/test1.sh | 122 + libdap2/test_vara.c | 583 + libdap2/todo | 7 + libdap2/translation.html | 505 + libdispatch/Make0 | 278 + libdispatch/Makefile.in | 940 - libdispatch/ddim.c | 64 +- libdispatch/defcheck.c | 42 + libdispatch/netcdf.m4 | 591 + libdispatch/stubdef.c | 16 + liblib/CMakeLists.txt | 5 +- liblib/Makefile.in | 732 - liblib/liblib.c | 15 + libsrc/Makefile.in | 860 - libsrc/depend | 121 + libsrc/ncFile.c | 220 + libsrc/ncstdio.c | 66 + libsrc/ncstdio.h | 60 + libsrc/ncx_cray.c | 3843 + libsrc/netcdf.3 | 1405 - libsrc/t_ncio.c | 373 + libsrc/t_ncio.in | 179453 +++++++++++++ libsrc/t_ncxx.m4 | 956 + libsrc/test_nc.sav | Bin 0 -> 8192 bytes libsrc/winceio.c | 734 + libsrc4/Makefile.in | 715 - libsrc4/nc3stub.c | 997 + libsrc4/nc3stub.h | 1026 + libsrc4/nc4file.c | 43 +- libsrc4/stub3.c | 24 + libsrc4/stub4.c | 18 + libsrc5/Makefile.in | 631 - ljna | 33 + ltmain.sh | 9655 - m4/empty | 0 m4/libtool.m4 | 7982 - m4/ltoptions.m4 | 384 - m4/ltsugar.m4 | 123 - m4/ltversion.m4 | 23 - m4/lt~obsolete.m4 | 98 - man4/CMakeLists.txt | 2 +- man4/{Doxyfile.in => Doxyfile.guide.in} | 61 +- man4/Doxyfile.in | 4 +- man4/{Doxyfile.in => Doxyfile.tutorial.in} | 69 +- man4/Makefile.am | 5 +- man4/Makefile.in | 681 - man4/all-error-codes.md | 103 + man4/cmake_faq.md | 72 + man4/errors.dox.old | 51 + man4/esg.html | 221 + man4/groups.dox | 5 + man4/header.html | 12 + man4/images/Makefile.in | 447 - man4/images/netcdf_architecture.odg | Bin 0 -> 14870 bytes man4/install-fortran.md | 143 + man4/install.md | 489 + man4/netcdf-50x50.png | Bin 0 -> 2059 bytes man4/old/defines.texi | 112 + man4/old/netcdf-c.texi | 12348 + man4/old/netcdf-cxx.texi | 1238 + man4/old/netcdf-cxx4.texi | 1215 + man4/old/netcdf-f77.texi | 9560 + man4/old/netcdf-f90.texi | 7089 + man4/old/netcdf-install.texi | 2000 + man4/old/netcdf-internal.texi | 681 + man4/old/netcdf-tutorial.texi | 2603 + man4/old/netcdf.texi | 6618 + man4/unidata_logo_cmyk.png | Bin 0 -> 6077 bytes mclean | 10 + missing | 215 - nc_test/Make0 | 15 + nc_test/Makefile.in | 1504 - nc_test/make_test_file.sh | 2 + nc_test/nc_enddef.c | 61 + nc_test/nc_enddef.cdl | 8 + nc_test/nc_sync.c | 557 + nc_test/nc_sync.cdl | 45 + nc_test/nc_sync.h | 6 + nc_test/nc_sync_child.c | 100 + nc_test/nc_test.html | 614 + nc_test4/Makefile.in | 2387 - nc_test4/bm_chunking.c | 165 + nc_test4/bm_radar.c | 284 + nc_test4/clear_cache.sh | 5 + nc_test4/tst_h_converts.c | 611 + nc_test4/tst_h_strings3.c | 70 + nc_test4/tst_h_vl2.c | 128 + nc_test4/tst_large3.c | 109 + nc_test4/tst_large5.c | 152 + nc_test4/tst_nc4perf.c | 5 + nc_test4/tst_nc_converts.c | 56 + nc_test4/tst_nc_test_file.c | 33 + nc_test4/tst_parallel3.c | 5 + nc_test4/tst_types.c | 341 + ncdap.m4 | 197 + ncdap_test/Makefile.in | 1356 - ncdap_test/expected3/Makefile.in | 479 - ncdap_test/expected4/Makefile.in | 478 - ncdap_test/expectremote3/Makefile.in | 474 - ncdap_test/expectremote3/slp_aggregated.1.dmp | 101 + ncdap_test/expectremote4/Makefile.in | 473 - ncdap_test/expectremote4/test.nc.dmp | 929 + ncdap_test/expecttds3/CMakeLists.txt | 10 + ncdap_test/expecttds3/Makefile.am | 23 + ncdap_test/expecttds3/testData.nc.dmp | 881 + ncdap_test/expecttds3/testData2.nc.dmp | 881 + ncdap_test/expecttds3/tst-NCEP-GFS-ALASKA.nc.dmp | 303 + ncdap_test/expecttds3/tst-NCEP-NAM-CONUS.nc.dmp | 9562 + ncdap_test/expecttds3/tst-NCEP-RUC-CONUS.nc.dmp | 144896 +++++++++++ ncdap_test/expecttds3/tst-NCEP-SREF-CONUS.nc.dmp | 62401 +++++ ncdap_test/expecttds3/tst-NWS-NDFD-CONUS.nc.dmp | 101144 ++++++++ ncdap_test/expecttds3/tst-PROFILER.nc.dmp | 13404 + ncdap_test/expecttds3/tst-PROFILER_RASS.nc.dmp | 213 + ncdap_test/expecttds3/tst-RUC.nc.dmp | 163282 ++++++++++++ ncdap_test/expecttds3/tst-ocean.nc.dmp | 7579 + ncdap_test/expecttds3/tst-sst.nc.dmp | 83717 ++++++ ncdap_test/expecttds3/tst-striped.nc.dmp | 99459 ++++++++ ncdap_test/expecttds3/tst-upc-nmm-point.nc.dmp | 765 + ncdap_test/nocacheremote3/CMakeLists.txt | 10 + ncdap_test/nocacheremote3/Makefile.am | 44 + ncdap_test/nocacheremote3/test.01.1.dmp | 7 + ncdap_test/nocacheremote3/test.01.dmp | 37 + ncdap_test/nocacheremote3/test.02.1.dmp | 9 + ncdap_test/nocacheremote3/test.02.dmp | 112 + ncdap_test/nocacheremote3/test.03.1.dmp | 15 + ncdap_test/nocacheremote3/test.03.2.dmp | 1012 + ncdap_test/nocacheremote3/test.03.dmp | 2295 + ncdap_test/nocacheremote3/test.04.1.dmp | 7 + ncdap_test/nocacheremote3/test.04.dmp | 33 + ncdap_test/nocacheremote3/test.05.1.dmp | 7 + ncdap_test/nocacheremote3/test.05.dmp | 33 + ncdap_test/nocacheremote3/test.06.1.dmp | 381 + ncdap_test/nocacheremote3/test.06.dmp | 3984 + ncdap_test/nocacheremote3/test.06a.dmp | 16 + ncdap_test/nocacheremote3/test.07.1.dmp | 9 + ncdap_test/nocacheremote3/test.07.2.dmp | 30 + ncdap_test/nocacheremote3/test.07.3.dmp | 18 + ncdap_test/nocacheremote3/test.07.4.dmp | 9 + ncdap_test/nocacheremote3/test.07.dmp | 61 + ncdap_test/nocacheremote3/test.07a.dmp | 18 + ncdap_test/nocacheremote3/test.21.dmp | 33 + ncdap_test/nocacheremote3/test.22.dmp | 397 + ncdap_test/nocacheremote3/test.23.dmp | 454 + ncdap_test/nocacheremote3/test.31.dmp | 77 + ncdap_test/nocacheremote3/test.32.dmp | 1894 + ncdap_test/nocacheremote3/test.50.dmp | 65 + ncdap_test/nocacheremote3/test.53.dmp | 117 + ncdap_test/nocacheremote3/test.55.dmp | 43 + ncdap_test/nocacheremote3/test.56.dmp | 24 + ncdap_test/nocacheremote3/test.57.dmp | 24 + ncdap_test/nocacheremote3/test.66.dmp | 64 + ncdap_test/nocacheremote3/test.67.dmp | 78 + ncdap_test/nocacheremote3/test.68.dmp | 2 + ncdap_test/nocacheremote3/test.69.dmp | 399 + ncdap_test/nocacheremote3/test.nc.dmp | 985 + ncdap_test/nocacheremote4/CMakeLists.txt | 10 + ncdap_test/nocacheremote4/Makefile.am | 44 + ncdap_test/nocacheremote4/test.01.1.dmp | 7 + ncdap_test/nocacheremote4/test.01.dmp | 35 + ncdap_test/nocacheremote4/test.02.1.dmp | 9 + ncdap_test/nocacheremote4/test.02.dmp | 93 + ncdap_test/nocacheremote4/test.03.1.dmp | 15 + ncdap_test/nocacheremote4/test.03.2.dmp | 1011 + ncdap_test/nocacheremote4/test.03.dmp | 1694 + ncdap_test/nocacheremote4/test.04.1.dmp | 11 + ncdap_test/nocacheremote4/test.04.dmp | 20 + ncdap_test/nocacheremote4/test.05.1.dmp | 14 + ncdap_test/nocacheremote4/test.05.dmp | 29 + ncdap_test/nocacheremote4/test.06.1.dmp | 15 + ncdap_test/nocacheremote4/test.06.dmp | 43 + ncdap_test/nocacheremote4/test.06a.dmp | 13 + ncdap_test/nocacheremote4/test.07.1.dmp | 9 + ncdap_test/nocacheremote4/test.07.2.dmp | 29 + ncdap_test/nocacheremote4/test.07.3.dmp | 14 + ncdap_test/nocacheremote4/test.07.4.dmp | 9 + ncdap_test/nocacheremote4/test.07.dmp | 30 + ncdap_test/nocacheremote4/test.07a.dmp | 19 + ncdap_test/nocacheremote4/test.21.dmp | 15 + ncdap_test/nocacheremote4/test.22.dmp | 25 + ncdap_test/nocacheremote4/test.23.dmp | 36 + ncdap_test/nocacheremote4/test.31.dmp | 24 + ncdap_test/nocacheremote4/test.32.dmp | 27 + ncdap_test/nocacheremote4/test.50.dmp | 31 + ncdap_test/nocacheremote4/test.53.dmp | 34 + ncdap_test/nocacheremote4/test.55.dmp | 23 + ncdap_test/nocacheremote4/test.56.dmp | 14 + ncdap_test/nocacheremote4/test.57.dmp | 14 + ncdap_test/nocacheremote4/test.66.dmp | 42 + ncdap_test/nocacheremote4/test.67.dmp | 78 + ncdap_test/nocacheremote4/test.68.dmp | 2 + ncdap_test/nocacheremote4/test.69.dmp | 401 + ncdap_test/nocacheremote4/test.nc.dmp | 929 + ncdap_test/run_ncdap_tests.sh | 73 + ncdap_test/special3/500m.dmp | 160 + ncdap_test/special3/500m.hdr | 118 + ncdap_test/special3/CMakeLists.txt | 10 + ncdap_test/special3/NCAR_Abiotic_equil.nc.hdr | 60 + ncdap_test/special3/NCAR_Biotic_equil.nc.hdr | 88 + ncdap_test/special3/O2_ann_nobs_1deg.nc.dmp | 100 + ncdap_test/special3/O2_ann_nobs_1deg.nc.hdr | 39 + .../TOMS-EP_L3-TOMSEPL3_1997m0107_v8.HDF.dmp | 47 + .../TOMS-EP_L3-TOMSEPL3_1997m0107_v8.HDF.hdr | 50 + ncdap_test/special3/coads_wspd.cdf.dmp | 425 + ncdap_test/special3/coads_wspd.cdf.hdr | 32 + ncdap_test/special3/d055.nc.dmp | 1204 + ncdap_test/special3/d055.nc.hdr | 221 + ncdap_test/special3/dods.dmp | 167 + ncdap_test/special3/dods.hdr | 142 + .../special3/duacs_global_nrt_msla_merged_h_lr.dmp | 249 + .../special3/duacs_global_nrt_msla_merged_h_lr.hdr | 44 + .../special3/n15.20091003.2145.usf.sst.hdf.dmp | 118 + .../special3/n15.20091003.2145.usf.sst.hdf.hdr | 117 + ncdap_test/special3/ocean_atlas_monthly.nc.dmp | 107 + ncdap_test/special3/ocean_atlas_monthly.nc.hdr | 43 + ncdap_test/special3/qscat_high_wind.dmp | 365 + ncdap_test/special3/qscat_high_wind.hdr | 92 + ncdap_test/special3/ssta.dods.dmp | 69 + ncdap_test/special3/ssta.dods.hdr | 27 + ncdap_test/special3/totalAagg.dmp | 1214 + ncdap_test/special3/totalAagg.hdr | 64 + ncdap_test/special3/world-unfilter-monthly.nc.dmp | 124 + ncdap_test/special3/world-unfilter-monthly.nc.hdr | 49 + ncdap_test/t_dap3b.c | 45 + ncdap_test/t_dap3c.c | 53 + ncdap_test/t_dap4.c | 470 + ncdap_test/t_dap4a.c | 940 + ncdap_test/t_dap4c.c | 54 + ncdap_test/test_partvar.c | 2 +- ncdap_test/test_partvar2.c | 1640 + ncdap_test/testdata3/Makefile.in | 540 - ncdap_test/tst_nocache3.sh | 21 + ncdap_test/tst_nocache4.sh | 21 + ncdap_test/tst_special.sh | 164 + ncdap_test/tst_tds.sh | 166 + ncdump/Makefile.in | 1871 - ncdump/cdl4/Makefile.in | 469 - ncdump/cdl4/c0.jdl | 386 + ncdump/cdl4/gfs1.cdl | 238383 ++++++++++++++++++ ncdump/cdl4/ref_ctest1_nc4.jdl | 389 + ncdump/cdl4/ref_ctest1_nc4c.jdl | 390 + ncdump/ctests.sh | 251 + ncdump/depend | 13 + ncdump/env | 6 + ncdump/expected4/Makefile.in | 470 - ncdump/ref_tst_comp2.cdl | 19 + ncdump/ref_tst_vlen_data2.cdl | 128 + ncgen/Make0 | 55 + ncgen/Makefile.in | 1163 - ncgen/cdfdata.c | 453 + ncgen/cmldata.c | 484 + ncgen/ctests.sh | 177 + ncgen/depend | 48 + ncgen/env | 18 + ncgen/foo.cdl | 55 + ncgen/ftests.sh | 178 + ncgen/gencml.c | 543 + ncgen/genjjni.c | 1601 + ncgen/genjstd.c | 480 + ncgen/jdatajni.c | 519 + ncgen/jdatastd.c | 251 + ncgen/jtests.sh | 174 + ncgen/lfs-tests | 54 + ncgen/ncgentab.h | 124 + ncgen/run_tests2.sh | 11 + ncgen3/Makefile.in | 1124 - ncgen3/bigf1.cdl | 14 + ncgen3/bigf2.cdl | 17 + ncgen3/bigf3.cdl | 17 + ncgen3/bigr1.cdl | 19 + ncgen3/bigr2.cdl | 19 + ncgen3/bigr3.cdl | 19 + ncgen3/depend | 48 + ncgen3/lfs-tests | 54 + ncgen3/load.c | 4 +- ncgen3/run_tests2.sh | 11 + nctest/Makefile.in | 1069 - nctest/depend | 120 + nctest/timesum.awk | 2 + netcdf-config-version.cmake.in | 6 +- netcdf-config.cmake.in | 2 +- oc2/Make0 | 66 + oc2/Makefile.in | 826 - oc2/dodsrc.example | 16 + oc2/occurlfunctions.c | 6 +- oc2/occurlfunctions.h | 8 +- oc2/ocdata.c | 2 +- oc2/ocdata.h | 2 +- oc2/ocdebug.c | 8 +- oc2/ocdebug.h | 8 +- oc2/ochttp.c | 15 +- oc2/ochttp.h | 13 +- oc2/ocinternal.c | 10 +- oc2/ocinternal.h | 5 +- oc2/ocnode.h | 2 +- oc2/ocrc.c | 4 +- test-driver | 139 - test_prog.F | 10 + test_prog.f90 | 12 + wjna | 43 + 348 files changed, 1220445 insertions(+), 65081 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel