This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 07f0d41d19d83ce92cf034b85391e31c9f939e23
Merge: 80bb58a 5d7898a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Thu Jan 14 16:56:57 2016 +0000
Merge debian/master to previous work
.gitignore | 19 +-
.travis.yml | 52 +
CMakeInstallation.cmake | 130 +
CMakeLists.txt | 1213 +-
COPYRIGHT | 4 -
CTestConfig.cmake.in | 5 +-
Doxyfile | 1934 --
INSTALL | 259 -
INSTALL.cmake | 161 -
docs/install.dox => INSTALL.md | 317 +-
Make0 | 35 +-
Makefile.am | 80 +-
Makefile.in | 1201 ++
PostInstall.cmake | 1 +
README.md | 71 +-
RELEASE_NOTES.md | 310 +-
aclocal.m4 | 1194 +
cf | 142 +-
cf.cmake | 16 +
compile | 347 +
config.guess | 1421 ++
config.h.in.cmake => config.h.cmake.in | 20 +-
config.h.in | 556 +
config.sub | 1807 ++
configure | 21515 +++++++++++++++++++
configure.ac | 542 +-
debian/README.source | 13 -
debian/changelog | 162 +-
debian/compat | 2 +-
debian/control | 70 +-
debian/copyright | 406 +-
debian/gbp.conf | 16 +
debian/libnetcdf-dev.install | 6 +-
debian/libnetcdf-dev.manpages | 2 +-
debian/libnetcdf7.symbols | 2769 +--
debian/nc-config.1 | 43 +
debian/netcdf-bin.install | 6 +-
debian/netcdf-bin.manpages | 4 -
...libnetcdf-dev.docs-base => netcdf-doc.doc-base} | 3 +-
debian/netcdf-doc.install | 2 +
debian/netcdf-doc.links | 1 +
debian/patches/hdf5-library-path.patch | 51 +
debian/patches/link-private.patch | 14 +
debian/patches/privacy-breach-logo.patch | 15 +
debian/patches/series | 3 +
debian/rules | 104 +-
debian/upstream/metadata | 6 +
debian/watch | 9 +-
depcomp | 791 +
docs/.gitignore | 2 +
docs/CMakeLists.txt | 106 +-
COPYRIGHT => docs/COPYRIGHT.dox | 11 +-
docs/{Doxyfile.guide.in => Doxyfile.developer} | 343 +-
docs/Doxyfile.in | 190 +-
docs/Doxyfile.tutorial.in | 2344 --
docs/DoxygenLayout.xml | 12 +-
docs/FAQ.md | 1957 ++
docs/Makefile.am | 30 +-
docs/Makefile.in | 747 +
docs/OPeNDAP.dox | 692 +
docs/all-error-codes.md | 117 +-
docs/architecture.dox | 15 +-
docs/attribute_conventions.md | 128 +
docs/auth.html | 476 +
docs/building-with-cmake.md | 2 +-
docs/cdl.dox | 44 +-
docs/cmake_faq.md | 51 +-
docs/credits.md | 118 +
docs/docmap.pdf | Bin 0 -> 64347 bytes
docs/errors.dox.old | 51 -
docs/esg.html | 1 +
docs/file_format_specifications.md | 744 +
docs/footer.html | 23 +-
docs/guide.dox | 1945 +-
docs/images/InstallTreeWindows.jpg | Bin 61966 -> 0 bytes
docs/images/InstallTreeWindows.png | Bin 291971 -> 0 bytes
docs/images/Makefile.am | 2 +-
docs/images/Makefile.in | 497 +
docs/images/netcdf_architecture.png | Bin 114366 -> 131864
bytes
docs/install-fortran.md | 232 +-
docs/install.md | 451 +-
docs/internal.dox | 28 +-
docs/known_problems.md | 1463 ++
docs/mainpage.dox | 35 +-
docs/netcdf.m4 | 102 +-
docs/{notes.dox => notes.md} | 73 +-
docs/old/netcdf-cxx4.texi | 2 +-
docs/old/netcdf-f77.texi | 6 +-
docs/old/netcdf-f90.texi | 6 +-
docs/old/netcdf-install.texi | 4 +-
docs/old/netcdf-internal.texi | 16 +-
docs/old/netcdf.texi | 12 +-
docs/release.css | 29 +
docs/release_header.html | 93 +
docs/software.md | 2609 +++
docs/tutorial.dox | 90 +-
docs/types.dox | 40 +-
docs/windows-binaries.md | 73 +-
dods.m4 | 2 +-
examples/C/CMakeLists.txt | 6 +-
examples/C/Makefile.am | 7 +-
examples/C/Makefile.in | 1237 ++
examples/C/parallel_vara.c | 191 +
examples/C/quick_large_files.c | 2 +-
examples/CDL/CMakeLists.txt | 5 -
examples/CDL/Makefile.in | 893 +
examples/CMakeLists.txt | 4 -
examples/Makefile.in | 685 +
h5_test/CMakeLists.txt | 12 +-
h5_test/Makefile.am | 13 +-
h5_test/Makefile.in | 1509 ++
h5_test/tst_h_endian_float.c | 83 +
h5_test/tst_h_vars.c | 86 +-
include/.gitignore | 1 +
include/CMakeLists.txt | 4 -
include/Makefile.am | 15 +-
include/Makefile.in | 638 +
include/err_macros.h | 12 +
include/nc3internal.h | 15 +-
include/nc4internal.h | 17 +-
include/nc_tests.h | 6 +
include/ncconfigure.h | 24 +-
include/ncdispatch.h | 110 +-
include/nctime.h | 4 +-
include/netcdf.h | 524 +-
include/netcdf_mem.h | 82 +
include/netcdf_meta.h.in | 52 +
include/utf8proc.h | 2 +-
install-sh | 501 +
libdap2/CMakeLists.txt | 6 +-
libdap2/Make0 | 2 +-
libdap2/Makefile.in | 865 +
libdap2/cache.c | 45 +-
libdap2/cdf.c | 107 +-
libdap2/constraints.c | 114 +-
libdap2/constraints.h | 36 +-
libdap2/dapcvt.c | 32 +-
libdap2/dapdebug.h | 2 -
libdap2/dapdump.c | 2 +-
libdap2/daputil.c | 35 +-
libdap2/dceconstraints.c | 4 +-
libdap2/dcelex.c | 18 +-
libdap2/dceparse.c | 30 +-
libdap2/env | 19 +-
libdap2/getvara.c | 218 +-
libdap2/nccommon.h | 5 +-
libdap2/ncd2dispatch.c | 165 +-
libdap2/ncdap.h | 6 +-
libdap2/ncdaperr.c | 2 +-
libdispatch/CMakeLists.txt | 4 -
libdispatch/Makefile.am | 108 +-
libdispatch/Makefile.in | 1008 +
libdispatch/dcopy.c | 166 +-
libdispatch/ddim.c | 43 +-
libdispatch/ddispatch.c | 119 +-
libdispatch/defcheck.c | 12 +-
libdispatch/derror.c | 46 +-
libdispatch/dfile.c | 677 +-
libdispatch/dgroup.c | 93 +-
libdispatch/dparallel.c | 3 -
libdispatch/dsubstrate.c | 7 +-
libdispatch/dtype.c | 41 +-
libdispatch/dutf8proc.c | 4 +-
libdispatch/dv2i.c | 50 +-
libdispatch/dvar.c | 65 +
libdispatch/dvarget.c | 217 +-
libdispatch/dvarinq.c | 122 +-
libdispatch/dvarput.c | 61 +-
libdispatch/nc.c | 14 +-
libdispatch/ncaux.c | 7 +-
libdispatch/ncsettings.hdr | 245 +
libdispatch/nctime.c | 6 +-
libdispatch/ncuri.c | 114 +-
liblib/CMakeLists.txt | 65 +-
liblib/Makefile.am | 23 +-
liblib/Makefile.in | 780 +
liblib/liblib.c | 15 -
liblib/nc_initialize.c | 122 +
liblib/stub.c | 80 -
libnetcdf.settings.in | 38 +
libsrc/CMakeLists.txt | 31 +-
libsrc/Makefile.am | 14 +-
libsrc/Makefile.in | 920 +
libsrc/attr.c | 413 +-
libsrc/attr.m4 | 87 +-
libsrc/ffio.c | 10 +-
libsrc/lookup3.c | 6 +-
libsrc/memio.c | 227 +-
libsrc/mmapio.c | 5 +-
libsrc/nc3dispatch.c | 14 +-
libsrc/nc3dispatch.h | 189 +
libsrc/nc3internal.c | 443 +-
libsrc/ncio.c | 45 +-
libsrc/ncio.h | 4 +-
libsrc/ncx.c | 15979 +++++++++++---
libsrc/ncx.h | 810 +-
libsrc/ncx.m4 | 2231 +-
libsrc/posixio.c | 194 +-
libsrc/pstdint.h | 2 +-
libsrc/putget.c | 6611 +++++-
libsrc/putget.m4 | 965 +-
libsrc/v1hpg.c | 190 +-
libsrc/var.c | 131 +-
libsrc/winceio.c | 4 +-
libsrc4/CMakeLists.txt | 4 -
libsrc4/Makefile.in | 763 +
libsrc4/nc4attr.c | 168 +-
libsrc4/nc4dim.c | 17 +-
libsrc4/nc4dispatch.c | 8 +-
libsrc4/nc4file.c | 885 +-
libsrc4/nc4grp.c | 2 +-
libsrc4/nc4hdf.c | 6097 +++---
libsrc4/nc4internal.c | 164 +-
libsrc4/nc4type.c | 17 +-
libsrc4/nc4var.c | 74 +-
libsrc4/ncfunc.c | 4 +-
libsrc5/CMakeLists.txt | 9 -
libsrc5/nc5dispatch.c | 1160 -
libsrcp/CMakeLists.txt | 5 +
{libsrc5 => libsrcp}/Makefile.am | 8 +-
libsrcp/Makefile.in | 679 +
libsrcp/ncpdispatch.c | 1604 ++
ljna | 33 -
ltmain.sh | 11147 ++++++++++
m4/libtool.m4 | 8369 ++++++++
m4/ltoptions.m4 | 437 +
m4/ltsugar.m4 | 124 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 99 +
missing | 215 +
nc-config.in.cmake => nc-config.cmake.in | 8 +-
nc-config.in | 4 +-
nc_test/CMakeLists.txt | 32 +-
nc_test/Make0 | 33 +-
nc_test/Makefile.am | 30 +-
nc_test/Makefile.in | 1603 ++
nc_test/large_files.c | 14 +-
nc_test/nc_sync.c | 2 +-
nc_test/nc_test.c | 95 +-
nc_test/quick_large_files.c | 2 +-
nc_test/run_diskless.sh | 2 +-
nc_test/run_diskless2.sh | 4 +-
nc_test/run_pnetcdf_test.sh | 6 +-
nc_test/t_nc.c | 49 +-
nc_test/{t_nc.c => t_nc_p5.c} | 38 +-
nc_test/test_get.c | 8534 +++++---
nc_test/test_get.m4 | 63 +-
nc_test/test_get_p5.c | 19215 +++++++++++++++++
nc_test/{test_get.m4 => test_get_p5.m4} | 65 +-
nc_test/test_put.c | 8744 ++++++--
nc_test/test_put.m4 | 156 +-
nc_test/test_read.c | 134 +-
nc_test/test_write.c | 147 +-
nc_test/tests.h | 143 +-
nc_test/tst_addvar.c | 84 +
nc_test/tst_atts.c | 48 +-
nc_test/tst_atts3.c | 136 +-
nc_test/tst_cdf5format.c | 228 +
nc_test/tst_diskless.c | 8 +-
nc_test/tst_diskless3.c | 70 +-
nc_test/tst_diskless4.c | 1 +
nc_test/tst_formatx_pnetcdf.c | 45 +-
nc_test/tst_meta.c | 35 +
nc_test/tst_misc.c | 21 +-
nc_test/tst_names.c | 67 +-
nc_test/tst_nofill.c | 18 +-
nc_test/tst_norm.c | 32 +-
nc_test/tst_put_vars.c | 69 +
nc_test/tst_small.c | 176 +-
nc_test/util.c | 277 +-
nc_test4/CMakeLists.txt | 32 +-
nc_test4/Makefile.am | 33 +-
nc_test4/Makefile.in | 2519 +++
nc_test4/bm_file.c | 9 +-
nc_test4/chunked.hdf4 | Bin 0 -> 741175 bytes
nc_test4/contiguous.hdf4 | Bin 0 -> 2919 bytes
nc_test4/renamegroup.c | 2 +
nc_test4/run_bm.sh | 2 +-
nc_test4/run_chunk_hdf4.sh | 34 +
nc_test4/run_get_hdf4_files.sh | 2 +-
nc_test4/run_grp_rename.sh | 14 +-
nc_test4/tst_atts_string_rewrite.c | 47 +
nc_test4/tst_camrun.c | 20 +-
nc_test4/tst_chunk_hdf4.c | 92 +
nc_test4/tst_chunks.c | 38 +
nc_test4/tst_converts.c | 4 +-
nc_test4/tst_create_files.c | 12 +-
nc_test4/tst_dims.c | 20 +-
nc_test4/tst_files.c | 10 +-
nc_test4/tst_fills2.c | 14 +
nc_test4/tst_h4_lendian.c | 168 +
nc_test4/tst_h5_endians.c | 136 +
nc_test4/tst_large.c | 12 +-
nc_test4/tst_large2.c | 13 +-
nc_test4/tst_large3.c | 10 +-
nc_test4/tst_large5.c | 10 +-
nc_test4/tst_parallel3.c | 3 -
nc_test4/tst_rename.c | 241 +
nc_test4/tst_types.c | 8 +-
nc_test4/tst_vars.c | 2 +-
nc_test4/tst_vars2.c | 8 +-
nc_test4/tst_vars3.c | 2 +-
ncdap.m4 | 197 -
ncdap_test/CMakeLists.txt | 46 +-
ncdap_test/Makefile.am | 24 +-
ncdap_test/Makefile.in | 1414 ++
ncdap_test/expected3/CMakeLists.txt | 6 +-
ncdap_test/expected3/Makefile.am | 1 +
ncdap_test/expected3/Makefile.in | 530 +
ncdap_test/expected3/testData.nc.dmp | 81 +
ncdap_test/expected4/CMakeLists.txt | 6 +-
ncdap_test/expected4/Makefile.in | 528 +
ncdap_test/expectremote3/CMakeLists.txt | 6 +-
ncdap_test/expectremote3/Makefile.in | 524 +
ncdap_test/expectremote4/CMakeLists.txt | 6 +-
ncdap_test/expectremote4/Makefile.in | 523 +
ncdap_test/expecttds3/CMakeLists.txt | 6 +-
ncdap_test/nctestserver.c | 32 +-
ncdap_test/nocacheremote3/CMakeLists.txt | 6 +-
ncdap_test/nocacheremote4/CMakeLists.txt | 6 +-
ncdap_test/special3/CMakeLists.txt | 6 +-
ncdap_test/t_auth.c | 205 +-
ncdap_test/t_misc.c | 14 +-
ncdap_test/t_ncf330.c | 80 +
ncdap_test/test_nstride_cached.c | 155 +-
ncdap_test/test_partvar.c | 12 +-
ncdap_test/test_partvar2.c | 12 +-
ncdap_test/test_vara.c | 2 +-
ncdap_test/test_varm3.c | 31 +-
ncdap_test/testauth.old | 213 +
ncdap_test/testauth.sh | 327 +
ncdap_test/testauth.sh.old | 197 +
ncdap_test/testdata3/CMakeLists.txt | 4 -
ncdap_test/testdata3/Makefile.am | 7 +-
ncdap_test/testdata3/Makefile.in | 592 +
ncdap_test/testdata3/synth9.dds | 2 +-
ncdap_test/testdata3/synth9.dods | 2 +-
ncdap_test/testurl.sh | 110 +
ncdap_test/tst_formatx.sh | 10 +-
ncdap_test/tst_ncdap.sh | 8 +-
ncdap_test/tst_ncdap3.sh | 11 +-
ncdap_test/tst_ncdap4.sh | 2 +
ncdap_test/tst_ncdap_shared.sh | 6 +-
ncdap_test/tst_nocache3.sh | 2 +
ncdap_test/tst_nocache4.sh | 2 +
ncdap_test/tst_remote.sh | 21 +-
ncdap_test/tst_remote3.sh | 5 +-
ncdap_test/tst_remote4.sh | 2 +
ncdap_test/tst_special.sh | 2 +
ncdap_test/tst_tds.sh | 2 +
ncdump/CMakeLists.txt | 173 +-
ncdump/Makefile.am | 54 +-
ncdump/Makefile.in | 1964 ++
ncdump/{cdl4 => cdl}/CMakeLists.txt | 6 +-
ncdump/{cdl4 => cdl}/Makefile.am | 1 +
ncdump/cdl/Makefile.in | 520 +
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/chunkspec.c | 2 +-
ncdump/ctest.c | 1333 --
ncdump/ctest64.c | 1333 --
ncdump/ctests.sh | 6 +-
ncdump/dumplib.c | 224 +-
ncdump/env | 14 +-
ncdump/{expected4 => expected}/CMakeLists.txt | 6 +-
ncdump/{expected4 => expected}/Makefile.am | 5 +-
ncdump/expected/Makefile.in | 519 +
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 | 217 +-
ncdump/nccopy.c | 151 +-
ncdump/ncdump.1 | 41 +-
ncdump/ncdump.c | 278 +-
ncdump/ncdump.h | 2 +
ncdump/nciter.c | 28 +-
ncdump/nctime0.c | 2 +-
ncdump/ref1.ncml | 2 +
ncdump/ref_ctest.c | 2 +-
ncdump/ref_ctest1_nc4.cdl | 2 +-
ncdump/ref_ctest1_nc4c.cdl | 2 +-
ncdump/ref_ctest64.c | 2 +-
ncdump/ref_tst_mud4_chars.cdl | 114 +
ncdump/ref_tst_utf8_4.cdl | 24 +
ncdump/run_back_comp_tests.sh | 9 +-
ncdump/run_tests.sh | 5 +
ncdump/run_utf8_nc4_tests.sh | 18 +
ncdump/run_utf8_tests.sh | 7 +
ncdump/tst_64bit.sh | 19 +-
ncdump/tst_bom.sh | 4 +-
ncdump/tst_bug321.cdl | 40 +
ncdump/tst_bug324.c | 97 +
ncdump/tst_fillbug.sh | 7 +
ncdump/tst_formatx3.sh | 19 +-
ncdump/tst_formatx4.sh | 8 +-
ncdump/tst_grp_spec.sh | 2 +-
ncdump/tst_h_scalar.sh | 2 +-
ncdump/tst_inmemory_nc3.sh | 54 +
ncdump/tst_inmemory_nc4.sh | 61 +
ncdump/tst_iter.sh | 2 +-
ncdump/tst_lengths.sh | 119 +-
ncdump/tst_mud.sh | 12 +-
ncdump/tst_nans.c | 8 +-
ncdump/tst_nccopy4.sh | 13 +-
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_ncml.cdl | 2 +
ncdump/tst_netcdf4.sh | 6 +-
ncdump/tst_output.sh | 28 +-
ncdump/vardata.c | 84 +-
ncgen/CMakeLists.txt | 25 +-
ncgen/ConvertUTF.h | 2 +-
ncgen/Make0 | 2 +-
ncgen/Makefile.am | 6 +-
ncgen/Makefile.in | 1210 ++
ncgen/bytebuffer.c | 43 +-
ncgen/c0.cdl | 3 +-
ncgen/c0_4.cdl | 2 +-
ncgen3/c0.cdl => ncgen/c5.cdl | 70 +-
ncgen/ctests.sh | 4 +-
ncgen/data.c | 91 +-
ncgen/data.h | 36 +-
ncgen/env | 24 +-
ncgen/escapes.c | 6 +-
ncgen/ftests.sh | 4 +-
ncgen/genbin.c | 101 +-
ncgen/genc.c | 6 +-
ncgen/genchar.c | 345 +-
ncgen/generate.c | 540 +-
ncgen/generr.c | 19 +-
ncgen/genf77.c | 1 -
ncgen/genlib.h | 9 +-
ncgen/jdata.c | 12 +-
ncgen/jtests.sh | 4 +-
ncgen/main.c | 216 +-
ncgen/ncgen.1 | 185 +-
ncgen/ncgen.h | 2 +-
ncgen/ncgen.l | 465 +-
ncgen/ncgen.y | 119 +-
ncgen/ncgentab.c | 2140 +-
ncgen/ncgentab.h | 149 +-
ncgen/ncgenyy.c | 1794 +-
ncgen/odom.c | 23 +
ncgen/odom.h | 4 +-
ncgen/run_nc4_tests.sh | 6 +-
ncgen/run_tests.sh | 21 +
ncgen/semantics.c | 29 +-
ncgen/util.c | 162 +-
ncgen/util.h | 12 +-
ncgen3/CMakeLists.txt | 22 +-
ncgen3/Makefile.in | 1171 +
ncgen3/c0.cdl | 3 +-
ncgen3/escapes.c | 2 +-
ncgen3/genlib.c | 2 +-
ncgen3/load.c | 35 +-
ncgen3/main.c | 8 +-
ncgen3/ncgen3.1 | 48 +-
ncgen3/run_nc4_tests.sh | 4 +
ncgen3/run_tests.sh | 5 +
nctest/CMakeLists.txt | 22 +-
nctest/Makefile.in | 1116 +
nctest/atttests.c | 2 +-
nctest/compare_test_files.sh | 7 +-
nctest/driver.c | 10 +-
nctest/ref_nctest_64bit_offset.nc | Bin 43504 -> 43696 bytes
nctest/ref_nctest_classic.nc | Bin 43392 -> 43584 bytes
nctest/varputg.c | 2 +-
nctest/vartests.c | 4 +-
nctest/vputget.c | 4 +-
nctest/vputgetg.c | 8 +-
netCDFConfig.cmake.in | 40 +
netcdf-config-version.cmake.in | 10 -
netcdf-config.cmake.in | 15 -
oc2/CMakeLists.txt | 11 +-
oc2/Make0 | 47 +-
oc2/Makefile.am | 5 +-
oc2/Makefile.in | 884 +
oc2/auth.html.in | 456 +
oc2/daplex.c | 28 +-
oc2/oc.c | 291 +-
oc2/oc.css | 39 +
oc2/oc.h | 55 +-
oc2/occompile.c | 45 +-
oc2/occonstraints.h | 6 +-
oc2/occurlflags.c | 322 +
oc2/occurlfunctions.c | 574 +-
oc2/occurlfunctions.h | 30 +-
oc2/ocdata.c | 69 +-
oc2/ocdata.h | 6 +-
oc2/ocdebug.c | 17 +-
oc2/ocdebug.h | 53 +-
oc2/ocdump.c | 88 +-
oc2/ochttp.c | 75 +-
oc2/ochttp.h | 3 +
oc2/ocinternal.c | 387 +-
oc2/ocinternal.h | 117 +-
oc2/oclist.c | 8 +-
oc2/ocrc.c | 809 +-
oc2/ocrc.h | 33 -
oc2/ocread.c | 1 -
oc2/ocuri.c | 223 +-
oc2/ocuri.h | 6 +-
oc2/ocutil.c | 69 +-
oc2/ocutil.h | 9 +-
oc2/xxdr.c | 14 +-
oc2/xxdr.h | 7 +-
postinstall.sh.in | 136 +
test-driver | 148 +
wjna | 4 +-
620 files changed, 165568 insertions(+), 35943 deletions(-)
diff --cc debian/changelog
index e0c14e1,52736d7..5ab3af7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,153 +1,167 @@@
- netcdf (1:4.3.2-1ubuntu1) UNRELEASED; urgency=medium
++netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium
++
++ * Test netcdf-parallel changes
++
++ -- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jan 2016 16:56:32 +0000
++
+ netcdf (1:4.4.0~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 12 Nov 2015 11:17:53 +0100
+
+ netcdf (1:4.4.0~rc4-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ - Includes fixes for inconsistent return types.
+ (closes: 749511)
+ * Update copyright for new files.
+ * Drop inconsistent-return-type.patch, applied upstream.
+ Refresh remaining patches.
+ * Update symbols for 4.4.0 RC4.
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 11 Nov 2015 22:16:31 +0100
+
+ netcdf (1:4.4.0~rc3-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 01 Nov 2015 20:41:08 +0100
+
+ netcdf (1:4.4.0~rc3-1~exp2) experimental; urgency=medium
+
+ * Enable tests, but disable parallel execution.
+ * Strip RPATH after dh_auto_install, RPATH required for tests.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 25 Oct 2015 13:55:32 +0100
+
+ netcdf (1:4.4.0~rc3-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update Vcs-Browser URL to use HTTPS.
+ * Update symbols for 4.4.0-rc3.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sat, 24 Oct 2015 18:59:45 +0200
+
+ netcdf (1:4.4.0~rc2-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 19 Aug 2015 19:21:34 +0200
+
+ netcdf (1:4.4.0~rc2-1~exp4) experimental; urgency=medium
+
+ * Add patch to append the HDF5 library & include paths in nc-config &
+ netcdf.pc.
+ * Switch back to building with the HDF5 serial variant instead of MPI only.
+ (reopens: #708638)
+ * Replace uppercase RC with lowercase rc in uversionmangle.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 31 Jul 2015 13:24:30 +0200
+
+ netcdf (1:4.4.0~rc2-1~exp3) experimental; urgency=medium
+
+ * Change libhdf5-openmpi-dev (build) dependency to libhdf5-mpi-dev,
+ this pulls in libhdf5-openmpi-dev & mpi-default-dev required to build
+ with the same compiler used for HDF5.
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 29 Jul 2015 13:18:47 +0200
+
+ netcdf (1:4.4.0~rc2-1~exp2) experimental; urgency=medium
+
+ * Update watch file to handle other tar extensions in filenamemangle.
+ * Add dependencies on hdf5 & curl -dev packages to libnetcdf-dev.
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 28 Jul 2015 01:22:07 +0200
+
+ netcdf (1:4.4.0~rc2-1~exp1) experimental; urgency=medium
+
+ * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build
dependency.
+ * New upstream release candidate.
+ * Refresh patches.
+ * Update symbols for 4.4.0~rc2.
+ * Drop Files-Excluded from copyright & repacksuffix from watch file,
+ autom4te.cache/ no longer included.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sat, 25 Jul 2015 02:12:24 +0200
+
+ netcdf (1:4.3.3.1+ds-1~exp2) experimental; urgency=medium
+
+ * Add Breaks/Replaces for nc-config move from -bin to -dev package.
+ (closes: #788464)
+ * Override dh_install to use --list-missing.
+ * Also include libnetcdf.settings in -dev package.
+ * Install manpages via .install files.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 11 Jun 2015 22:03:39 +0200
+
+ netcdf (1:4.3.3.1+ds-1~exp1) experimental; urgency=medium
[ Nico Schlömer ]
- * Upgrade to 4.3.2 (C-only)
+ * Upgrade to 4.3.3.1 (C-only)
++>>>>>>> origin/master
(Closes: #735075)
+ * Fix segfault with malformed URLs (Closes: #757884)
+ * Fix ncdump crash with exit status 139 (Closes: #716126)
+ * Fix nccopy crash with exit status 139 (Closes: #716601)
+ * Proper multiarch support (Closes: #676477)
+ * Parallel build of hdf5 now detected (Closes: #708638)
* Switch to CMake build
- * Proper multiarch support
- (Closes: #676477)
- * TODO:
- - static libs
- - proper doc installation
+ * Add myself to Uploaders.
+ * Remove unnecessary dependency on dpkg (>= 1.15.4) | install-info.
+ * Shorten synopsis of libnetcdf-dev.
+
+ [ Bas Couwenberg ]
+ * Update watch file to use GitHub releases.
+ * Add gbp.conf to use pristine-tar by default.
+ * Use canonical Vcs-* URLs.
+ * Bump debhelper compatibility to 9.
+ * Restructure control file with cme.
+ * Remove duplicate section from netcdf-bin.
+ * Enable verbose make output.
+ * Enable parallel builds.
+ * Override dh_strip to use netcdf-dbg explicitly.
+ * Add DEP3 headers to link-private.patch.
+ * Fix privacy-breach-logo lintian error by using the local copy.
+ * Remove unused substitution variable ${shlibs:Depends} from libnetcdf-dev.
+ * Use libjs-jquery instead of jquery.js from Doxygen.
+ * Add patch to fix 'absence' typo in ncgen man page.
+ * Move nc-config from netcdf-bin to libnetcdf-dev.
+ * Install RELEASE_NOTES.md as upstream changelog.
+ * Add patch to fix hyphen-used-as-minus-sign lintian issues in man pages.
+ * Add man page for nc-config.
+ * Update copyright file using copyright-format 1.0.
+ * Add symbols file for libnetcdf.
+ * Add upstream metadata.
+ * Drop README.source, no longer applicable.
+ * Bump Standards-Version to 3.9.6, changes: canonical Vcs-* URLs,
+ minimal dh rules, copyright-format 1.0, symbols.
+ * Add myself to Uploaders.
+ * Repack upstream tarball to exclude autom4te.cache directory.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 19 Mar 2015 22:35:59 +0100
+
+ netcdf (1:4.1.3-7.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * use dh-autoreconf to build, to cope with newer architectures. Thanks
+ to Fernando Seiti Furusato for the patch. Closes: #755829
+
+ -- Steve McIntyre <93...@debian.org> Fri, 03 Oct 2014 13:21:45 +0100
+
+ netcdf (1:4.1.3-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support hdf5 1.8.13 new packaging layout (Closes: #756687).
++<<<<<<< HEAD
+ [ Alastair McKinstry ]
+ * Make netcdf-mpi package, co-installable with serial one.
+
+ -- Nico Schlömer <nico.schloe...@gmail.com> Mon, 12 May 2014 14:27:06 +0200
++=======
+ -- Gilles Filippini <p...@debian.org> Thu, 24 Jul 2014 16:11:22 +0200
++>>>>>>> origin/master
netcdf (1:4.1.3-7) unstable; urgency=low
diff --cc debian/control
index f47fa6a,f2dd1a9..4810e8d
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,29 +1,31 @@@
Source: netcdf
+ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+ Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
+ Nico Schlömer <nico.schloe...@gmail.com>,
- Bas Couwenberg <sebas...@debian.org>
++ Bas Couwenberg <sebas...@debian.org>,
++ Alastair McKinstry <mckins...@debian.org>
Section: science
Priority: optional
- Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
- Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
- Build-Depends: debhelper (>= 8),
- cmake,
- m4,
- doxygen,
- libhdf5-dev (>= 1.8.6-1~),
- libhdf5-mpi-dev (>= 1.8.13+docs~),
- libcurl4-gnutls-dev
- Standards-Version: 3.9.5
+ Build-Depends: debhelper (>= 9),
+ cmake (>= 2.8.12),
+ chrpath,
+ m4,
+ doxygen,
+ libjs-jquery,
+ libhdf5-dev (>= 1.8.6-1~),
++ libhdf5-mpi-dev (>= 1.8.13+docs~),
+ libcurl4-gnutls-dev | libcurl-ssl-dev
+ Standards-Version: 3.9.6
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/netcdf.git
+ Vcs-Git: git://anonscm.debian.org/pkg-grass/netcdf.git
Homepage: http://www.unidata.ucar.edu/software/netcdf/
- Vcs-Browser: http://git.debian.org/?p=pkg-grass/netcdf.git
- Vcs-Git: git://git.debian.org/git/pkg-grass/netcdf.git
Package: netcdf-doc
- Section: doc
Architecture: all
- Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
- Description: Documentation for NetCDF and CF
+ Section: doc
+ Depends: libjs-jquery,
+ ${misc:Depends}
+ Description: Documentation for NetCDF
NetCDF (network Common Data Form) is an interface for scientific
data access and a freely-distributed software library that provides an
implementation of the interface. The netCDF library also defines a
@@@ -80,30 -77,12 +96,31 @@@ Description: creation, access, and shar
.
This package provides headers.
+Package: libnetcdf-mpi-dev
+Architecture: any
+Section: libdevel
+Depends: libnetcdf-dev(= ${binary:Version}),
+ loibnetcdf7-mpi (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Suggests: netcdf-bin, netcdf-doc
+Recommends: pkg-config
+Description: creation, access, and sharing of array-oriented scientific data
+ NetCDF (network Common Data Form) is a set of interfaces for array-oriented
+ data access and a freely distributed collection of data access libraries for
+ C, Fortran, C++, Java, and other languages. The netCDF libraries support a
+ machine-independent format for representing scientific data. Together, the
+ interfaces, libraries, and format support the creation, access, and sharing
of
+ scientific data.
+ .
+ This package provides headers.
+
+
Package: netcdf-dbg
+ Architecture: any
Section: debug
Priority: extra
- Architecture: any
- Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
+ Depends: libnetcdf7 (= ${binary:Version}),
+ ${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
This package contains the files that make it possible to debug the
diff --cc debian/patches/series
index 92e27ce,60a8cb7..31d6868
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,4 @@@
+version-script.patch
+ link-private.patch
+ privacy-breach-logo.patch
-hdf5-library-path.patch
++# hdf5-library-path.patch
diff --cc debian/rules
index 8196696,ce6478c..e5df35f
--- a/debian/rules
+++ b/debian/rules
@@@ -1,88 -1,50 +1,92 @@@
#!/usr/bin/make -f
- %:
- dh $@ --buildsystem=cmake
+ #export DH_VERBOSE=1
+
+ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+ HDF5_INCLUDE_PATH=/usr/include/hdf5/serial
+ HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
- export DH_VERBOSE=1
+ UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+
+ # Verbose test output
+ export VERBOSE=1
+
+ %:
+ dh $@ --buildsystem=cmake --parallel
+include /usr/share/mpi-default-dev/debian_defaults
+MPI:=${ARCH_DEFAULT_MPI_IMPL}
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIB:=/usr/lib/${DEB_HOST_MULTIARCH}
+TOP:=$(shell pwd)
+
override_dh_auto_configure:
- dh_auto_configure -- \
+ dh_auto_configure --builddirectory=build-serial -- \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DENABLE_DAP:BOOL=ON \
- -DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
- -DENABLE_TESTS:BOOL=ON \
- -DENABLE_DOXYGEN:BOOL=OFF \
- -DUSE_PARALLEL=OFF \
- -DHDF5_C_INCLUDE_DIR="/usr/include/serial/hdf5" \
- -DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" \
- -DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_serial_hl.so \
- -DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_serial.so \
-
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-serial.ver
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DCMAKE_VERBOSE_MAKEFILE=1 \
+ -DENABLE_TESTS:BOOL=ON \
+ -DENABLE_DOXYGEN:BOOL=ON \
- -DHDF5_INCLUDE_PATH=$(HDF5_INCLUDE_PATH) \
- -DHDF5_LIBRARY_PATH=$(HDF5_LIBRARY_PATH)
++ -DUSE_PARALLEL=OFF \
++ -DHDF5_C_INCLUDE_DIR="/usr/include/serial/hdf5" \
++ -DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" \
++ -DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_serial_hl.so \
++ -DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_serial.so \
++
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-serial.ver
+ dh_auto_configure --builddirectory=build-mpi -- \
- -DCMAKE_SKIP_RPATH:BOOL=ON \
- -DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
- -DENABLE_PARALLEL_TESTS:BOOL=OFF \
- -DENABLE_TESTS:BOOL=ON \
- -DENABLE_DOXYGEN:BOOL=OFF \
- -DUSE_PARALLEL=ON \
- -DHDF5_C_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
- -DHDF5_HL_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
- -DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}_hl.so \
- -DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}.so \
-
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-mpi.ver \
- -DCMAKE_C_COMPILER=mpicc
++ -DCMAKE_SKIP_RPATH:BOOL=OFF \
++ -DENABLE_PARALLEL_TESTS:BOOL=OFF \
++ -DENABLE_TESTS:BOOL=ON \
++ -DENABLE_DOXYGEN:BOOL=ON \
++ -DUSE_PARALLEL=ON \
++ -DHDF5_C_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
++ -DHDF5_HL_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
++ -DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}_hl.so \
++ -DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}.so \
++
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-mpi.ver \
++ -DCMAKE_C_COMPILER=mpicc
-override_dh_auto_test:
- ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo
"Ignoring test failures"
+override_dh_auto_build:
+ $(MAKE) -C build-serial
+ $(MAKE) -C build-mpi
- override_dh_auto_test:
- LD_LIBRARY_PATH=$(TOP)/build-serial/liblib $(MAKE) -C build-serial test
- LD_LIBRARY_PATH=$(TOP)/build-mpi/liblib $(MAKE) -C build-mpi test
-
-override_dh_auto_install:
- dh_auto_install
+override_dh_auto_clean:
+ rm -rf build-*
+override_dh_auto_install:
+ $(MAKE) -C build-serial install DESTDIR=$(TOP)/debian/tmp
+ $(MAKE) -C build-mpi install DESTDIR=$(TOP)/debian/tmp-mpi
+ mv debian/tmp/$(LIB)/libnetcdf.so.7.2.0
debian/tmp/$(LIB)/libnetcdf_serial.so.7.2.0
+ mv debian/tmp/$(LIB)/libnetcdf.so.7
debian/tmp/$(LIB)/libnetcdf_serial.so.7
+ mv debian/tmp/$(LIB)/libnetcdf.so
debian/tmp/$(LIB)/libnetcdf_serial.so
+ mv debian/tmp-mpi/$(LIB)/libnetcdf.so.7.2.0
debian/tmp-mpi/$(LIB)/libnetcdf_mpi.so.7.2.0
+ mv debian/tmp-mpi/$(LIB)/libnetcdf.so.7
debian/tmp-mpi/$(LIB)/libnetcdf_mpi.so.7
+ mv debian/tmp-mpi/$(LIB)/libnetcdf.so
debian/tmp-mpi/$(LIB)/libnetcdf_mpi.so
+ sed -e 's/-lnetcdf/-lnetcdf_serial/' <
debian/tmp/$(LIB)/pkgconfig/netcdf.pc \
+ > debian/tmp/$(LIB)/pkgconfig/netcdf-serial.pc
+ rm debian/tmp/$(LIB)/pkgconfig/netcdf.pc
+ sed -e 's/-lnetcdf/-lnetcdf_mpi/' <
debian/tmp-mpi/$(LIB)/pkgconfig/netcdf.pc \
+ > debian/tmp-mpi/$(LIB)/pkgconfig/netcdf-mpi.pc
+ rm debian/tmp-mpi/$(LIB)/pkgconfig/netcdf.pc
+ $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
-
++ $(RM) debian/tmp-mpi/usr/share/doc/netCDF/html/jquery.js
+ # Strip RPATH
+ -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
chrpath --delete {} \;
+ -find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath
--delete {} \;
++ -find $(CURDIR)/debian/tmp-mpi/usr/bin -type f -not -name nc-config
-exec chrpath --delete {} \;
++ -find $(CURDIR)/debian/tmp-mpi/usr/lib -type f -name "*.so*" -exec
chrpath --delete {} \;
+
-override_dh_install:
- dh_install --list-missing
++override_dh_auto_test:
++ ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo
"Ignoring test failures"
++ #LD_LIBRARY_PATH=$(TOP)/build-serial/liblib $(MAKE) -C build-serial test
++ #LD_LIBRARY_PATH=$(TOP)/build-mpi/liblib $(MAKE) -C build-mpi test
+
+ override_dh_installchangelogs:
+ dh_installchangelogs RELEASE_NOTES.md
+
+ override_dh_strip:
+ dh_strip --dbg-package=netcdf-dbg
+
+ override_dh_makeshlibs:
+ dh_makeshlibs -- -v$(UPSTREAM_VERSION)
- #install/libnetcdf7::
- # find debian/tmp/usr/lib/ -name 'libnetcdf.*' -a ! -type d \
- # -a ! -name '*.so' -a ! -name '*.a' \
- # -a ! -name '*.la' -a ! -name '*.pc' \
- # -exec cp -d {} debian/libnetcdf7/usr/lib/ \;
- #
- #install/libnetcdf-dev::
- # cp debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/.
- # install -m 644 -o root -g root $(CURDIR)/netcdf.pc
debian/libnetcdf-dev/usr/lib/pkgconfig/.
- # # removes an erroneous libpath due to an upstream oversight in
configure.ac
- # sed -i -e 's,-L/usr ,,' -e 's,@FLIBS@,,'
debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
- # # move links and files
- # find debian/tmp/usr/lib/ -type l -a -name "libnetcdf*" -a -name '*.so'
-exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
- # find debian/tmp/usr/lib/ -type f -a -name "libnetcdf*" -a -name '*.a'
-exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
-
- #install/netcdf-doc::
- # install -d debian/tmp/doc
- # install -d debian/tmp/usr/share/doc/netcdf
- # install -d debian/tmp/usr/share/info
- # install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/.
--
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
