[netcdf] 01/01: Merge with 4.4.0
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Feb 19 09:39:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit a4efb0e2af9bbc1ffa3804753c55fa3cd08352de
Merge: 6bd25e2 40c1983
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Feb 19 09:38:52 2016 +0000
Merge with 4.4.0
.gitignore | 4 -
.travis.yml | 63 +-
.travis.yml => .travis.yml.old | 0
CMakeLists.txt | 230 +-
CONTRIBUTING.html | 248 +
Makefile.in | 1 -
RELEASE_NOTES.md | 32 +-
cf | 13 +-
cf.cmake | 70 +-
config.h.cmake.in | 23 +-
config.h.in | 3 +
configure | 53 +-
configure.ac | 22 +-
debian/changelog | 23 +-
debian/control | 6 +-
debian/copyright | 42 +-
debian/{libnetcdf7.install => libnetcdf11.install} | 0
debian/libnetcdf11.symbols | 1460 ++
debian/libnetcdf7.symbols | 1463 --
debian/patches/attributes-typo.patch | 16 +
debian/patches/hdf5-library-path.patch | 2 +-
debian/patches/m4-generated-sources.patch | 503 +
debian/patches/series | 4 +-
debian/rules | 6 +-
docs/Doxyfile.developer | 2 +-
docs/Makefile.in | 1 -
docs/images/Makefile.in | 1 -
docs/release_header.html | 4 +-
docs/software.md | 113 +-
docs/tutorial.dox | 22 +-
docs/windows-binaries.md | 26 +-
examples/C/Makefile.in | 1 -
examples/C/simple_xy_nc4_rd.c | 4 +-
examples/C/simple_xy_nc4_wr.c | 5 +-
examples/CDL/Makefile.in | 1 -
examples/Makefile.in | 1 -
h5_test/Makefile.in | 1 -
include/Makefile.in | 1 -
include/nc.h | 18 +-
include/netcdf.h | 23 +-
include/onstack.h | 8 +-
libdap2/Makefile.in | 1 -
libdap2/ncd2dispatch.c | 12 +-
libdispatch/Makefile.in | 1 -
libdispatch/dattget.c | 109 +-
libdispatch/dattput.c | 54 +-
libdispatch/dstring.c | 48 +-
libdispatch/dvar.c | 18 +-
liblib/Makefile.am | 4 +-
liblib/Makefile.in | 5 +-
libnetcdf.settings.in | 7 +-
libsrc/Makefile.in | 1 -
libsrc/dim.c | 11 +-
libsrc/ncx.h | 53 +-
libsrc/ncx.m4 | 38 +-
libsrc/posixio.c | 4 +
libsrc/putget.m4 | 16 +-
libsrc/v1hpg.c | 145 +-
libsrc4/Makefile.in | 1 -
libsrc4/nc4var.c | 259 +-
libsrcp/Makefile.in | 1 -
nc_test/CMakeLists.txt | 1 +
nc_test/Makefile.in | 1 -
nc_test/nc_test.c | 17 +-
nc_test/test_get.c | 18662 +++++++--------
nc_test/test_put.c | 23884 +++++++++----------
nc_test/test_read.c | 67 +-
nc_test/test_write.c | 62 +-
nc_test/tests.h | 18 +-
nc_test/util.c | 101 +-
nc_test4/CMakeLists.txt | 5 +-
nc_test4/Makefile.am | 3 +-
nc_test4/Makefile.in | 4 +-
nc_test4/bm_many_objs.c | 5 +-
nc_test4/tst_put_vars_two_unlim_dim.c | 67 +
ncdap_test/Makefile.in | 1 -
ncdap_test/expected3/Makefile.in | 1 -
ncdap_test/expected3/test.07.dmp | 6 +
ncdap_test/expected3/test.21.dmp | 6 +
ncdap_test/expected4/Makefile.in | 1 -
ncdap_test/expected4/test.07.dmp | 6 +
ncdap_test/expected4/test.21.dmp | 6 +
ncdap_test/expectremote3/Makefile.in | 1 -
ncdap_test/expectremote3/test.01.1.dmp | 10 +
ncdap_test/expectremote3/test.01.dmp | 6 +
ncdap_test/expectremote3/test.07.1.dmp | 10 +
ncdap_test/expectremote3/test.07.3.dmp | 10 +
ncdap_test/expectremote3/test.07.4.dmp | 10 +
ncdap_test/expectremote3/test.07.dmp | 6 +
ncdap_test/expectremote4/Makefile.in | 1 -
ncdap_test/expectremote4/test.01.1.dmp | 10 +
ncdap_test/expectremote4/test.01.dmp | 6 +
ncdap_test/expectremote4/test.07.1.dmp | 10 +
ncdap_test/expectremote4/test.07.dmp | 6 +
ncdap_test/t_dap3a.c | 4 +-
ncdap_test/testdata3/Makefile.in | 1 -
ncdap_test/testdata3/synth6.das | 24 +-
ncdump/CMakeLists.txt | 17 +-
ncdump/Make0 | 24 +
ncdump/Makefile.am | 24 +-
ncdump/Makefile.in | 81 +-
ncdump/cdl/Makefile.am | 2 +-
ncdump/cdl/Makefile.in | 3 +-
ncdump/cdl/ref_keyword.cdl | 9 +
ncdump/cdl/ref_tst_solar_1.cdl | 4 +-
ncdump/chunkspec.c | 10 +-
ncdump/ctests.sh | 2 +-
ncdump/expected/Makefile.am | 2 +-
ncdump/expected/Makefile.in | 3 +-
ncdump/expected/c0.dmp | 4 +-
ncdump/expected/ref_ctest1_nc4.dmp | 4 +-
ncdump/expected/ref_ctest1_nc4c.dmp | 4 +-
ncdump/expected/ref_keyword.dmp | 8 +
ncdump/expected/ref_tst_solar_1.dmp | 4 +-
ncdump/inttags.cdl | 15 +
ncdump/inttags4.cdl | 23 +
ncdump/ncdump.c | 29 +-
ncdump/ncdump.h | 3 +-
ncdump/ref_ctest1_nc4.cdl | 4 +-
ncdump/ref_inttags.cdl | 15 +
ncdump/ref_inttags4.cdl | 24 +
ncdump/ref_tst_solar_1.cdl | 4 +-
ncdump/run_back_comp_tests.sh | 1 +
ncdump/run_tests.sh | 1 +
ncdump/run_utf8_nc4_tests.sh | 1 +
ncdump/run_utf8_tests.sh | 1 +
ncdump/tst_64bit.sh | 1 +
ncdump/tst_bom.sh | 1 +
ncdump/tst_calendars.sh | 1 +
ncdump/tst_charfill.sh | 1 +
ncdump/tst_dimsizes.c | 80 +
ncdump/tst_dimsizes.sh | 57 +
ncdump/tst_fillbug.sh | 1 +
ncdump/tst_formatx3.sh | 1 +
ncdump/tst_formatx4.sh | 1 +
ncdump/tst_grp_spec.sh | 1 +
ncdump/tst_h_scalar.sh | 1 +
ncdump/tst_inmemory_nc3.sh | 2 +-
ncdump/tst_inmemory_nc4.sh | 2 +-
ncdump/tst_inttags.sh | 20 +
ncdump/tst_inttags4.sh | 21 +
ncdump/tst_iter.sh | 1 +
ncdump/tst_lengths.sh | 2 +-
ncdump/tst_mud.sh | 1 +
ncdump/tst_nccopy3.sh | 1 +
ncdump/tst_nccopy4.sh | 1 +
ncdump/tst_ncgen4.sh | 1 +
ncdump/tst_ncgen4_classic.sh | 1 +
ncdump/tst_ncgen4_cycle.sh | 1 +
ncdump/tst_ncgen4_diff.sh | 11 +-
ncdump/tst_ncgen_shared.sh | 4 +-
ncdump/tst_netcdf4.sh | 2 +
ncdump/tst_netcdf4_4.sh | 1 +
ncdump/tst_output.sh | 1 +
ncdump/vardata.c | 66 +-
ncgen/CMakeLists.txt | 28 +-
ncgen/Makefile.am | 21 +-
ncgen/Makefile.in | 34 +-
ncgen/c0_4.cdl | 10 +-
ncgen/cdata.c | 6 +-
ncgen/data.c | 6 +
ncgen/data.h | 2 +
ncgen/genbin.c | 10 +-
ncgen/genc.c | 59 +-
ncgen/generr.c | 20 +-
ncgen/generr.h | 6 +
ncgen/genlib.h | 8 +-
ncgen/getfill.c | 4 +-
ncgen/main.c | 92 +-
ncgen/ncf345.cdl | 1743 ++
ncgen/ncgen.1 | 14 +-
ncgen/ncgen.l | 330 +-
ncgen/ncgen.y | 36 +-
ncgen/{ncgenyy.c => ncgenl.c} | 1659 +-
ncgen/{ncgentab.c => ncgeny.c} | 1314 +-
ncgen/{ncgentab.h => ncgeny.h} | 96 +-
ncgen/offsets.h | 2 +-
ncgen/run_nc4_tests.sh | 5 +
ncgen/run_tests.sh | 2 +-
ncgen/semantics.c | 131 +-
ncgen/util.c | 59 +
ncgen/util.h | 7 +-
ncgen3/Makefile.in | 1 -
nctest/Makefile.in | 1 -
nctest/atttests.c | 2 +-
oc2/CMakeLists.txt | 2 +-
oc2/Make0 | 12 +-
oc2/Makefile.am | 8 +-
oc2/Makefile.in | 27 +-
oc2/auth.html.in | 4 +-
oc2/dap.y | 2 +-
oc2/daplex.c | 2 +-
oc2/dapparse.c | 2 +-
oc2/{daptab.c => dapy.c} | 1642 +-
oc2/{daptab.h => dapy.h} | 88 +-
oc2/oc.css | 39 -
oc2/oc.h | 2 +-
oc2/ochttp.c | 2 -
oc2/ocinternal.c | 2 +-
oc2/ocnode.c | 245 +-
200 files changed, 30299 insertions(+), 26445 deletions(-)
diff --cc debian/changelog
index f4b2c55,24003d7..6c512c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,32 @@@
- netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium
++netcdf (1:4.4.0-2~exp1) UNRELEASED; urgency=medium
+
+ * Add mpi, pnetcdf variants of netcdf. Closes: #708638.
+ * use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
+ * Enable MMAP in diskless.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 14 Jan 2016 16:56:32 +0000
+
+ netcdf (1:4.4.0-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 21 Jan 2016 20:00:17 +0100
+
+ netcdf (1:4.4.0-1~exp2) experimental; urgency=medium
+
+ * Add patch to fix conflicting type errors on arm.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 17 Jan 2016 15:42:03 +0100
+
+ netcdf (1:4.4.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update copyright file, add license & copyright for Bison files.
+ * Rename library package for SONAME bump.
+ * Add patch for 'attributes' typo.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 15 Jan 2016 02:21:00 +0100
+
netcdf (1:4.4.0~rc5-1~exp1) experimental; urgency=medium
* New upstream release candidate.
diff --cc debian/control
index 19c28bf,0271ac4..a90297c
--- a/debian/control
+++ b/debian/control
@@@ -93,10 -58,11 +93,10 @@@ Description: Interface for scientific d
Package: libnetcdf-dev
Architecture: any
Section: libdevel
- Depends: libnetcdf7 (= ${binary:Version}),
+ Depends: libnetcdf11 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
- ${misc:Depends}
-Recommends: pkg-config
+ ${misc:Depends}, pkg-config
Breaks: netcdf-bin (<< 1:4.3.3.1)
Replaces: netcdf-bin (<< 1:4.3.3.1)
Suggests: netcdf-bin,
diff --cc debian/patches/series
index 2c34306,3da4b85..04678ad
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,8 @@@
+version-script.patch
link-private.patch
privacy-breach-logo.patch
+nc-config.patch
+reproducible.patch
- # hdf5-library-path.patch
+ hdf5-library-path.patch
+ attributes-typo.patch
+ m4-generated-sources.patch
diff --cc debian/rules
index da6d435,ce6478c..e290e0c
--- a/debian/rules
+++ b/debian/rules
@@@ -104,14 -35,9 +104,14 @@@ override_dh_auto_install
# 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 {} \;
+ dh_link -p libnetcdf-dev . $(LIBDIR)/netcdf/serial/lib
+ dh_link -p libnetcdf-dev /usr/include $(LIBDIR)/netcdf/serial/include
-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=$(CURDIR)/build-serial/liblib $(MAKE) -C build-serial test
- #LD_LIBRARY_PATH=$(CURDIR)/build-mpi/liblib $(MAKE) -C build-mpi test
- #LD_LIBRARY_PATH=$(CURDIR)/build-pnetcdf/liblib $(MAKE) -C build-pnetcdf test
++ LD_LIBRARY_PATH=$(CURDIR)/build-serial/liblib $(MAKE) -C build-serial test
++ LD_LIBRARY_PATH=$(CURDIR)/build-mpi/liblib $(MAKE) -C build-mpi test
++ LD_LIBRARY_PATH=$(CURDIR)/build-pnetcdf/liblib $(MAKE) -C build-pnetcdf test
override_dh_installchangelogs:
dh_installchangelogs RELEASE_NOTES.md
--
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