[netcdf] 01/01: Merge branch 'upstream' into split-c-f-cxx
Nico Schlömer
nschloe-guest at moszumanska.debian.org
Thu Jan 15 18:56:57 UTC 2015
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 909ed37ce79698894a5ca7e28212a7cf6a9e3c80
Merge: 1d01119 ed39029
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date: Thu Jan 15 01:07:38 2015 +0100
Merge branch 'upstream' into split-c-f-cxx
BRANCH-STATUS | 5 +
CMakeInstallation.cmake | 130 +
CMakeLists.txt | 910 +-
COPYRIGHT | 4 -
CTestConfig.cmake | 17 -
CTestConfig.cmake.in | 2 +-
Doxyfile | 1934 ---
docs/Doxyfile.guide.in => Doxyfile.developer | 322 +-
Make0 | 35 +-
Makefile.am | 53 +-
Makefile.in | 1177 ++
PostInstall.cmake | 1 +
README.md | 8 +-
RELEASE_NOTES.md | 128 +-
aclocal.m4 | 1194 ++
cf | 30 +-
cf.cmake | 14 +
compile | 347 +
config.guess | 1421 +++
config.h.cmake.in | 18 +-
config.h.in | 516 +
config.sub | 1807 +++
configure | 12627 +++++++++++++++++--
configure.ac | 164 +-
depcomp | 791 ++
docs/CMakeLists.txt | 85 +-
COPYRIGHT => docs/COPYRIGHT.dox | 11 +-
docs/Doxyfile.in | 177 +-
docs/Doxyfile.tutorial.in | 2344 ----
docs/DoxygenLayout.xml | 12 +-
docs/FAQ.md | 1952 +++
docs/Makefile.am | 11 +-
docs/Makefile.in | 726 ++
docs/all-error-codes.md | 117 +-
docs/building-with-cmake.md | 2 +-
docs/cdl.dox | 44 +-
docs/cmake_faq.md | 4 -
docs/credits.md | 120 +
docs/docmap.pdf | Bin 0 -> 64347 bytes
docs/errors.dox.old | 51 -
docs/guide.dox | 310 +-
docs/images/InstallTreeWindows.jpg | Bin 61966 -> 0 bytes
docs/images/InstallTreeWindows.png | Bin 291971 -> 44671 bytes
docs/images/Makefile.am | 2 +-
docs/images/Makefile.in | 487 +
docs/install-fortran.md | 47 +
docs/install.dox | 18 +-
docs/install.md | 54 +-
docs/internal.dox | 26 +-
docs/mainpage.dox | 25 +-
docs/notes.dox | 37 +-
docs/tutorial.dox | 86 +-
docs/types.dox | 22 +-
docs/windows-binaries.md | 52 +-
examples/C/Makefile.in | 1207 ++
examples/CDL/Makefile.in | 883 ++
examples/Makefile.in | 675 +
h5_test/CMakeLists.txt | 6 +-
h5_test/Makefile.in | 1499 +++
include/.gitignore | 1 +
include/Makefile.am | 11 +-
include/Makefile.in | 625 +
include/nc4internal.h | 11 +-
include/ncconfigure.h | 20 +-
include/ncdispatch.h | 4 +-
include/nctime.h | 4 +-
include/netcdf.h | 440 +-
include/netcdf_meta.h.in | 52 +
install-sh | 501 +
libdap2/Make0 | 2 +-
libdap2/Makefile.in | 855 ++
libdap2/cache.c | 45 +-
libdap2/cdf.c | 41 +-
libdap2/constraints.c | 61 +-
libdap2/constraints.h | 36 +-
libdap2/dapdebug.h | 1 -
libdap2/dapdump.c | 2 +-
libdap2/dcelex.c | 18 +-
libdap2/dceparse.c | 30 +-
libdap2/env | 18 +-
libdap2/getvara.c | 113 +-
libdap2/ncd2dispatch.c | 107 +-
libdap2/ncdap.h | 2 +-
libdap2/ncdaperr.c | 2 +-
libdispatch/Makefile.am | 108 +-
libdispatch/Makefile.in | 998 ++
libdispatch/dcopy.c | 10 +-
libdispatch/ddim.c | 41 +-
libdispatch/ddispatch.c | 53 +-
libdispatch/defcheck.c | 12 +-
libdispatch/derror.c | 34 +-
libdispatch/dfile.c | 123 +-
libdispatch/dgroup.c | 90 +-
libdispatch/dtype.c | 41 +-
libdispatch/dv2i.c | 2 +-
libdispatch/dvarget.c | 198 +-
libdispatch/dvarput.c | 7 +-
libdispatch/ncaux.c | 7 +-
libdispatch/ncsettings.hdr | 245 +
libdispatch/nctime.c | 6 +-
libdispatch/ncuri.c | 112 +-
liblib/CMakeLists.txt | 36 +-
liblib/Makefile.in | 770 ++
libncdap.tar.gz | Bin 0 -> 316361 bytes
libnetcdf.settings.in | 55 +-
libsrc/Makefile.am | 2 +-
libsrc/Makefile.in | 898 ++
libsrc/attr.c | 339 +
libsrc/nc3dispatch.c | 2 +-
libsrc/ncx.c | 6159 ++++++++-
libsrc/ncx.m4 | 6 +-
libsrc/posixio.c | 130 +-
libsrc/putget.c | 3959 ++++++
libsrc/var.c | 72 +-
libsrc4/Makefile.in | 753 ++
libsrc4/nc4attr.c | 132 +-
libsrc4/nc4dim.c | 15 +-
libsrc4/nc4file.c | 358 +-
libsrc4/nc4grp.c | 2 +-
libsrc4/nc4hdf.c | 6043 ++++-----
libsrc4/nc4internal.c | 158 +-
libsrc4/nc4type.c | 17 +-
libsrc4/nc4var.c | 17 +-
libsrc5/Makefile.in | 669 +
libsrc5/nc5dispatch.c | 59 +-
ltmain.sh | 11088 ++++++++++++++++
m4/libtool.m4 | 8318 ++++++++++++
m4/ltoptions.m4 | 437 +
m4/ltsugar.m4 | 124 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 99 +
missing | 215 +
nc_test/CMakeLists.txt | 24 +-
nc_test/Make0 | 5 +-
nc_test/Makefile.am | 16 +-
nc_test/Makefile.in | 1560 +++
nc_test/large_files.c | 4 +
nc_test/run_diskless.sh | 2 +-
nc_test/run_pnetcdf_test.sh | 3 +-
nc_test/test_get.c | 6233 ++++++++-
nc_test/test_get.m4 | 9 +-
nc_test/test_put.c | 7206 +++++++++++
nc_test/tst_diskless.c | 8 +-
nc_test/tst_diskless4.c | 1 +
nc_test/tst_meta.c | 34 +
nc_test/tst_norm.c | 8 +-
nc_test4/CMakeLists.txt | 19 +-
nc_test4/Makefile.am | 2 +-
nc_test4/Makefile.in | 2457 ++++
nc_test4/renamegroup.c | 2 +
nc_test4/run_get_hdf4_files.sh | 2 +-
nc_test4/run_grp_rename.sh | 2 +-
nc_test4/tst_dims.c | 20 +-
nc_test4/tst_parallel3.c | 3 -
nc_test4/tst_rename.c | 161 +
ncdap_test/CMakeLists.txt | 6 +-
ncdap_test/Makefile.am | 16 +-
ncdap_test/Makefile.in | 1391 ++
ncdap_test/expected3/Makefile.am | 1 +
ncdap_test/expected3/Makefile.in | 520 +
ncdap_test/expected3/testData.nc.dmp | 81 +
ncdap_test/expected4/Makefile.in | 518 +
ncdap_test/expectremote3/Makefile.in | 514 +
ncdap_test/expectremote4/Makefile.in | 513 +
ncdap_test/nctestserver.c | 32 +-
ncdap_test/t_auth.c | 205 +-
ncdap_test/t_misc.c | 14 +-
ncdap_test/test_nstride_cached.c | 155 +-
ncdap_test/test_partvar.c | 12 +-
ncdap_test/test_partvar2.c | 12 +-
ncdap_test/test_varm3.c | 31 +-
ncdap_test/testauth.sh | 197 +
ncdap_test/testdata3/Makefile.in | 580 +
ncdap_test/testurl.sh | 110 +
ncdap_test/tst_formatx.sh | 8 +-
ncdap_test/tst_ncdap.sh | 3 +-
ncdap_test/tst_remote.sh | 10 +-
ncdap_test/tst_remote3.sh | 1 -
ncdump/CMakeLists.txt | 8 +-
ncdump/Makefile.am | 20 +-
ncdump/Makefile.in | 1909 +++
ncdump/{cdl4 => cdl}/CMakeLists.txt | 0
ncdump/{cdl4 => cdl}/Makefile.am | 1 +
ncdump/cdl/Makefile.in | 510 +
ncdump/{cdl4 => cdl}/bigf1.cdl | 0
ncdump/{cdl4 => cdl}/bigf2.cdl | 0
ncdump/{cdl4 => cdl}/bigf3.cdl | 0
ncdump/{cdl4 => cdl}/bigr1.cdl | 0
ncdump/{cdl4 => cdl}/bigr2.cdl | 0
ncdump/{cdl4 => cdl}/bigr3.cdl | 0
ncdump/{cdl4 => cdl}/c0.cdl | 0
ncdump/{cdl4 => cdl}/c0.jdl | 0
ncdump/{cdl4 => cdl}/example_good.cdl | 0
ncdump/{cdl4 => cdl}/fills.cdl | 0
ncdump/{cdl4 => cdl}/gfs1.cdl | 0
ncdump/{cdl4 => cdl}/n3time.cdl | 0
ncdump/{cdl4 => cdl}/nc_enddef.cdl | 0
ncdump/{cdl4 => cdl}/nc_sync.cdl | 0
ncdump/{cdl4 => cdl}/pres_temp_4D.cdl | 0
ncdump/{cdl4 => cdl}/ref_const_test.cdl | 0
ncdump/{cdl4 => cdl}/ref_ctest1_nc4.cdl | 0
ncdump/{cdl4 => cdl}/ref_ctest1_nc4.jdl | 0
ncdump/{cdl4 => cdl}/ref_ctest1_nc4c.cdl | 0
ncdump/{cdl4 => cdl}/ref_ctest1_nc4c.jdl | 0
ncdump/{cdl4 => cdl}/ref_dimscope.cdl | 0
ncdump/{cdl4 => cdl}/ref_nctst.cdl | 0
ncdump/{cdl4 => cdl}/ref_nctst_64bit_offset.cdl | 0
ncdump/{cdl4 => cdl}/ref_nctst_netcdf4.cdl | 0
ncdump/{cdl4 => cdl}/ref_nctst_netcdf4_classic.cdl | 0
ncdump/{cdl4 => cdl}/ref_niltest.cdl | 0
ncdump/{cdl4 => cdl}/ref_solar.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_chardata.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_comp.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_comp2.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_comp3.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_econst.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_enum_data.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_group_data.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_h_scalar.cdl | 0
ncdump/cdl/ref_tst_long_charconst.cdl | 9 +
ncdump/{cdl4 => cdl}/ref_tst_names.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_nans.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_nul3.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_nul4.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_opaque_data.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_small.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_solar_1.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_solar_2.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_special_atts.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_special_atts3.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_string_data.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_unicode.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_unlim2.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_utf8.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_vlen_data.cdl | 0
ncdump/{cdl4 => cdl}/ref_tst_vlen_data2.cdl | 0
ncdump/{cdl4 => cdl}/ref_typescope.cdl | 0
ncdump/{cdl4 => cdl}/sfc_pres_temp.cdl | 0
ncdump/{cdl4 => cdl}/simple_xy.cdl | 0
ncdump/{cdl4 => cdl}/small.cdl | 0
ncdump/{cdl4 => cdl}/small2.cdl | 0
ncdump/{cdl4 => cdl}/test0.cdl | 0
ncdump/cdl/tst_chararray.cdl | 24 +
ncdump/{cdl4 => cdl}/tst_ncml.cdl | 0
ncdump/{cdl4 => cdl}/unlimtest1.cdl | 0
ncdump/{cdl4 => cdl}/unlimtest2.cdl | 0
ncdump/ctests.sh | 4 +-
ncdump/env | 14 +-
ncdump/{expected4 => expected}/CMakeLists.txt | 0
ncdump/{expected4 => expected}/Makefile.am | 5 +-
ncdump/expected/Makefile.in | 509 +
ncdump/{expected4 => expected}/c0.dmp | 0
ncdump/{expected4 => expected}/example_good.dmp | 0
ncdump/{expected4 => expected}/fills.dmp | 0
ncdump/{expected4 => expected}/n3time.dmp | 0
ncdump/{expected4 => expected}/nc_enddef.dmp | 0
ncdump/{expected4 => expected}/nc_sync.dmp | 0
ncdump/{expected4 => expected}/pres_temp_4D.dmp | 0
ncdump/{expected4 => expected}/ref_const_test.dmp | 0
ncdump/{expected4 => expected}/ref_ctest1_nc4.dmp | 0
ncdump/{expected4 => expected}/ref_ctest1_nc4c.dmp | 0
ncdump/{expected4 => expected}/ref_dimscope.dmp | 0
ncdump/{expected4 => expected}/ref_nctst.dmp | 0
.../ref_nctst_64bit_offset.dmp | 0
.../{expected4 => expected}/ref_nctst_netcdf4.dmp | 0
.../ref_nctst_netcdf4_classic.dmp | 0
ncdump/{expected4 => expected}/ref_niltest.dmp | 0
ncdump/{expected4 => expected}/ref_solar.dmp | 0
.../{expected4 => expected}/ref_tst_chardata.dmp | 0
ncdump/{expected4 => expected}/ref_tst_comp.dmp | 0
ncdump/{expected4 => expected}/ref_tst_comp2.dmp | 0
ncdump/{expected4 => expected}/ref_tst_comp3.dmp | 0
ncdump/{expected4 => expected}/ref_tst_econst.dmp | 0
.../{expected4 => expected}/ref_tst_enum_data.dmp | 0
.../{expected4 => expected}/ref_tst_group_data.dmp | 0
.../{expected4 => expected}/ref_tst_h_scalar.dmp | 0
ncdump/expected/ref_tst_long_charconst.dmp | 9 +
ncdump/{expected4 => expected}/ref_tst_names.dmp | 0
ncdump/{expected4 => expected}/ref_tst_nans.dmp | 0
ncdump/{expected4 => expected}/ref_tst_nul3.dmp | 0
ncdump/{expected4 => expected}/ref_tst_nul4.dmp | 0
.../ref_tst_opaque_data.dmp | 0
ncdump/{expected4 => expected}/ref_tst_small.dmp | 0
ncdump/{expected4 => expected}/ref_tst_solar_1.dmp | 0
ncdump/{expected4 => expected}/ref_tst_solar_2.dmp | 0
.../ref_tst_special_atts.dmp | 0
.../ref_tst_special_atts3.dmp | 0
.../ref_tst_string_data.dmp | 0
ncdump/{expected4 => expected}/ref_tst_unicode.dmp | 0
ncdump/{expected4 => expected}/ref_tst_unlim2.dmp | 0
ncdump/{expected4 => expected}/ref_tst_utf8.dmp | 0
.../{expected4 => expected}/ref_tst_vlen_data.dmp | 0
.../{expected4 => expected}/ref_tst_vlen_data2.dmp | 0
ncdump/{expected4 => expected}/ref_typescope.dmp | 0
ncdump/{expected4 => expected}/sfc_pres_temp.dmp | 0
ncdump/{expected4 => expected}/simple_xy.dmp | 0
ncdump/{expected4 => expected}/small.dmp | 0
ncdump/{expected4 => expected}/small2.dmp | 0
ncdump/{expected4 => expected}/test0.dmp | 0
ncdump/expected/tst_chararray.dmp | 27 +
ncdump/{expected4 => expected}/tst_ncml.dmp | 0
ncdump/{expected4 => expected}/unlimtest1.dmp | 0
ncdump/{expected4 => expected}/unlimtest2.dmp | 0
ncdump/nccopy.1 | 155 +-
ncdump/nccopy.c | 121 +-
ncdump/ncdump.1 | 3 +-
ncdump/nciter.c | 28 +-
ncdump/ref_tst_mud4_chars.cdl | 114 +
ncdump/run_back_comp_tests.sh | 4 +-
ncdump/run_tests.sh | 5 +
ncdump/tst_bom.sh | 4 +-
ncdump/tst_bug321.cdl | 40 +
ncdump/tst_formatx3.sh | 4 +-
ncdump/tst_formatx4.sh | 4 +-
ncdump/tst_grp_spec.sh | 2 +-
ncdump/tst_h_scalar.sh | 2 +-
ncdump/tst_iter.sh | 2 +-
ncdump/tst_mud.sh | 12 +-
ncdump/tst_nans.c | 8 +-
ncdump/tst_nccopy4.sh | 5 +
ncdump/tst_ncgen4.sh | 2 +-
ncdump/tst_ncgen4_cycle.sh | 2 +-
ncdump/tst_ncgen4_diff.sh | 2 +-
.../{tst_ncgen4_shared.sh => tst_ncgen_shared.sh} | 23 +-
ncdump/tst_netcdf4.sh | 6 +-
ncdump/tst_output.sh | 16 +-
ncdump/vardata.c | 82 +-
ncgen/CMakeLists.txt | 6 +-
ncgen/Make0 | 2 +-
ncgen/Makefile.am | 2 +-
ncgen/Makefile.in | 1200 ++
ncgen/bytebuffer.c | 43 +-
ncgen/ctests.sh | 4 +-
ncgen/data.c | 91 +-
ncgen/data.h | 36 +-
ncgen/env | 24 +-
ncgen/escapes.c | 4 +-
ncgen/ftests.sh | 4 +-
ncgen/genbin.c | 69 +-
ncgen/genchar.c | 345 +-
ncgen/generate.c | 529 +-
ncgen/generr.c | 3 +-
ncgen/genf77.c | 1 -
ncgen/jdata.c | 12 +-
ncgen/jtests.sh | 4 +-
ncgen/main.c | 137 +-
ncgen/ncgen.1 | 69 +-
ncgen/ncgen.h | 2 +-
ncgen/ncgen.l | 4 +-
ncgen/ncgenyy.c | 108 +-
ncgen/odom.c | 23 +
ncgen/odom.h | 4 +-
ncgen/run_nc4_tests.sh | 6 +-
ncgen/semantics.c | 18 +-
ncgen/util.c | 162 +-
ncgen/util.h | 12 +-
ncgen3/Makefile.in | 1161 ++
ncgen3/load.c | 31 +-
ncgen3/ncgen3.1 | 2 +-
nctest/Makefile.in | 1106 ++
nctest/driver.c | 2 +-
netCDFConfig.cmake.in | 40 +
netcdf-config-version.cmake.in | 10 -
netcdf-config.cmake.in | 15 -
oc2/CMakeLists.txt | 4 +-
oc2/Make0 | 16 +-
oc2/Makefile.am | 3 +-
oc2/Makefile.in | 874 ++
oc2/oc.c | 257 +-
oc2/oc.h | 51 +-
oc2/occompile.c | 35 +-
oc2/occonstraints.h | 6 +-
oc2/occurlflags.c | 316 +
oc2/occurlfunctions.c | 570 +-
oc2/occurlfunctions.h | 30 +-
oc2/ocdata.c | 2 +-
oc2/ocdebug.c | 17 +-
oc2/ocdebug.h | 53 +-
oc2/ocdump.c | 44 +-
oc2/ochttp.c | 71 +-
oc2/ochttp.h | 3 +
oc2/ocinternal.c | 372 +-
oc2/ocinternal.h | 117 +-
oc2/oclist.c | 8 +-
oc2/ocrc.c | 795 +-
oc2/ocrc.h | 33 -
oc2/ocread.c | 1 -
oc2/ocuri.c | 216 +-
oc2/ocuri.h | 6 +-
oc2/ocutil.c | 69 +-
oc2/ocutil.h | 9 +-
oc2/xxdr.c | 12 +-
postinstall.sh.in | 133 +
test-driver | 148 +
wjna | 4 +-
395 files changed, 103477 insertions(+), 13286 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