[netcdf] 01/31: merge 4.4.1~rc1
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Oct 11 10:44:47 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 818f7b409921520132d0bdf3fe8c53ae53f50ade
Merge: 51cd56c 05921e8
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Apr 19 00:57:48 2016 +0100
merge 4.4.1~rc1
.github/ISSUE_TEMPLATE.md | 26 +
.gitignore | 13 +-
.travis.yml | 18 +-
.travis.yml.old | 52 -
CMakeLists.txt | 123 +-
CONTRIBUTING.html | 248 -
CONTRIBUTING.md | 77 +
Makefile.in | 1 +
RELEASE_NOTES.md | 18 +-
cf | 2 +-
config.h.cmake.in | 10 +-
config.h.in | 6 +
configure | 99 +-
configure.ac | 33 +-
debian/changelog | 25 +-
debian/control | 24 +-
debian/copyright | 2 +-
debian/libnetcdf-11.install | 1 -
debian/libnetcdf-11.symbols | 1463 --
debian/libnetcdf-12.install | 1 +
...cdf-mpi-11.install => libnetcdf-mpi-12.install} | 0
...cdf-mpi-11.symbols => libnetcdf-mpi-12.symbols} | 0
...cdf-11.install => libnetcdf-pnetcdf-12.install} | 0
debian/libnetcdf12.symbols | 1526 ++
debian/netcdf-bin.lintian-overrides | 2 +
debian/patches/attributes-typo.patch | 16 -
debian/patches/hdf5-library-path.patch | 14 +-
debian/patches/m4-generated-sources.patch | 503 -
debian/patches/privacy-breach-logo.patch | 11 +
debian/rules | 6 +
docs/CMakeLists.txt | 1 +
docs/Doxyfile.developer | 4 +-
docs/Doxyfile.in | 29 +-
docs/FAQ.md | 10 +-
docs/Makefile.am | 4 +-
docs/Makefile.in | 5 +-
docs/OPeNDAP.dox | 3 +-
docs/credits.md | 4 +-
docs/esg.html | 222 -
docs/esg.md | 223 +
docs/guide.dox | 7 +-
docs/images/Makefile.in | 1 +
docs/mainpage.dox | 13 +-
docs/obsolete/fan_utils.html | 1437 ++
docs/release.css | 4 +-
docs/release_header.html | 2 +-
docs/software.md | 18 +-
docs/types.dox | 8 +-
docs/windows-binaries.md | 28 +-
examples/C/Makefile.in | 1 +
examples/CDL/Makefile.in | 1 +
examples/Makefile.in | 1 +
h5_test/CMakeLists.txt | 2 +-
h5_test/Makefile.in | 1 +
include/CMakeLists.txt | 23 +
include/Makefile.am | 2 +-
include/Makefile.in | 5 +-
include/nc.h | 1 -
include/nc3internal.h | 9 +-
include/nc4internal.h | 34 +-
include/nc_hashmap.h | 39 +
include/nc_tests.h | 3 +
include/ncdispatch.h | 34 +-
include/netcdf.h | 2 +-
include/netcdf_mem.h | 53 +-
include/netcdf_meta.h.in | 2 +-
include/netcdf_par.h | 11 +-
libdap2/Makefile.in | 1 +
libdap2/dapcvt.c | 33 +-
libdap2/dapdebug.h | 4 +-
libdap2/env | 14 +-
libdap2/getvara.c | 2 +-
libdap2/nccommon.h | 4 +
libdap2/ncd2dispatch.c | 817 +-
libdap2/ncd2dispatch.h | 210 +
libdispatch/CMakeLists.txt | 4 +-
libdispatch/Makefile.am | 3 +-
libdispatch/Makefile.in | 39 +-
libdispatch/datt.c | 2 +
libdispatch/dattget.c | 16 +-
libdispatch/ddim.c | 11 +-
libdispatch/ddispatch.c | 10 +-
libdispatch/dfile.c | 107 +-
libdispatch/dinternal.c | 48 +
libdispatch/dparallel.c | 40 +-
libdispatch/dsubstrate.c | 941 --
libdispatch/dvar.c | 2 +
libdispatch/dvarget.c | 5 +-
libdispatch/dvarinq.c | 39 +
libdispatch/dvarput.c | 113 +-
libdispatch/ncuri.c | 22 +-
liblib/CMakeLists.txt | 10 +-
liblib/Makefile.am | 2 +-
liblib/Makefile.in | 3 +-
liblib/nc_initialize.c | 4 -
libsrc/CMakeLists.txt | 2 +-
libsrc/Makefile.am | 6 +-
libsrc/Makefile.in | 30 +-
libsrc/attr.c | 685 +
libsrc/dim.c | 45 +-
libsrc/ffio.c | 66 +-
libsrc/nc3internal.c | 11 +-
libsrc/nc_hashmap.c | 392 +
libsrc/ncx.c | 16754 ++++++++++++++++++-
libsrc/ncx.h | 17 +-
libsrc/ncx.m4 | 150 +-
libsrc/ncx_cray.c | 520 +-
libsrc/netcdf.3 | 1405 ++
libsrc/posixio.c | 174 +-
libsrc/putget.c | 8673 +++++++++-
libsrc/t_ncio.c | 12 +-
libsrc/v1hpg.c | 231 +-
libsrc/var.c | 46 +-
libsrc/winceio.c | 74 +-
libsrc4/Makefile.in | 1 +
libsrc4/nc4dim.c | 16 +-
libsrc4/nc4file.c | 50 +-
libsrc4/nc4hdf.c | 327 +-
libsrc4/nc4internal.c | 34 +-
libsrc4/nc4var.c | 25 +-
libsrcp/Makefile.in | 1 +
nc-config.cmake.in | 34 +-
nc-config.in | 38 +-
nc_test/CMakeLists.txt | 2 +-
nc_test/Makefile.am | 4 +-
nc_test/Makefile.in | 42 +-
nc_test/error.c | 4 +-
nc_test/test_get.c | 9331 -----------
nc_test/test_put.c | 11942 -------------
nc_test/tst_inq_type.c | 164 +
nc_test4/CMakeLists.txt | 17 +-
nc_test4/Make0 | 31 +
nc_test4/Makefile.am | 14 +-
nc_test4/Makefile.in | 125 +-
nc_test4/bm_file.c | 10 +-
nc_test4/bm_radar.c | 4 +-
nc_test4/ref_hdf5_compat1.nc | Bin 0 -> 859591 bytes
nc_test4/ref_hdf5_compat2.nc | Bin 0 -> 6240 bytes
nc_test4/ref_hdf5_compat3.nc | Bin 0 -> 6256 bytes
nc_test4/run_empty_vlen_test.sh | 34 +
nc_test4/run_par_test.sh | 4 +
nc_test4/tst_compounds.c | 138 +-
nc_test4/tst_compounds3.c | 2 +-
nc_test4/tst_empty_vlen_unlim.c | 224 +
nc_test4/tst_files3.c | 4 +-
nc_test4/tst_hdf5_file_compat.c | 63 +
nc_test4/tst_mode.c | 41 +
ncdap_test/Makefile.in | 1 +
ncdap_test/expected3/Makefile.in | 1 +
ncdap_test/expected4/Makefile.in | 1 +
ncdap_test/expectremote3/Makefile.in | 1 +
ncdap_test/expectremote4/Makefile.in | 1 +
ncdap_test/test_partvar.c | 2 +-
ncdap_test/testdata3/Makefile.in | 1 +
ncdap_test/tst_remote.sh | 4 +-
ncdump/Makefile.in | 1 +
ncdump/cdl/Makefile.in | 1 +
ncdump/ctest.c | 1456 ++
ncdump/ctest64.c | 1456 ++
ncdump/expected/Makefile.in | 1 +
ncdump/ncdump.c | 14 +-
ncdump/ref1.ncml | 1 +
ncdump/tst_ncml.cdl | 1 +
ncgen/Makefile.in | 1 +
ncgen/ncgen.1 | 2 +-
ncgen3/Makefile.in | 1 +
nctest/Makefile.in | 1 +
oc2/Makefile.in | 1 +
oc2/ocdump.c | 39 +-
update_hdf5_compat_files.sh | 7 +
170 files changed, 36797 insertions(+), 27290 deletions(-)
diff --cc debian/changelog
index 6c512c7,f2d3e53..6dddd96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,31 @@@
- netcdf (1:4.4.0-2~exp1) UNRELEASED; urgency=medium
++netcdf (1:4.4.1~rc1-1exp2) 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
++ -- Alastair McKinstry <mckinstry at debian.org> Tue, 19 Apr 2016 00:54:19 +0100
++
+ netcdf (1:4.4.1~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop patches applied upstream.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Update copyright file, update copyright years for Unidata.
+ * Rename library package for SONAME bump.
+ * Update privacy-breach-logo.patch to also remove favicon link.
+ * Update symbols for 4.4.1-rc1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 16 Apr 2016 18:41:28 +0200
+
+ netcdf (1:4.4.0-2) unstable; urgency=medium
+
+ * Update Vcs-Git URL to use HTTPS.
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Add build dependency on graphviz for dot.
+ * Enable all hardening buildflags, except PIE (breaks the build).
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 27 Mar 2016 13:43:30 +0200
netcdf (1:4.4.0-1) unstable; urgency=medium
diff --cc debian/control
index 94d60fe,d08c59b..c0eb031
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -10,13 +11,15 @@@ Build-Depends: debhelper (>= 9)
chrpath,
m4,
doxygen,
+ graphviz,
libjs-jquery,
+ libaec-dev,
libhdf5-dev (>= 1.8.6-1~),
+ libhdf5-mpi-dev (>= 1.8.13+docs~),
libcurl4-gnutls-dev | libcurl-ssl-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/netcdf.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/netcdf.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-grass/netcdf.git
Homepage: http://www.unidata.ucar.edu/software/netcdf/
Package: netcdf-doc
@@@ -37,7 -35,7 +38,7 @@@ Description: Documentation for NetCD
This package contains documentation for the NetCDF library in a
variety of formats.
- Package: libnetcdf-11
-Package: libnetcdf12
++Package: libnetcdf-12
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@@ -58,43 -56,14 +59,44 @@@ Description: Interface for scientific d
This package contains the C run-time shared libraries required
by programs.
- Package: libnetcdf-mpi-11
++Package: libnetcdf-mpi-12
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Interface for scientific data access to large binary data
+ 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
+ machine-independent format for representing scientific data.
+ Together, the interface, library, and format support the creation,
+ access, and sharing of scientific data.
+ .
+ This package contains the C run-time shared libraries required
+ by programs.
+
- Package: libnetcdf-pnetcdf-11
++Package: libnetcdf-pnetcdf-12
++
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Interface for scientific data access to large binary data
+ 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
+ machine-independent format for representing scientific data.
+ Together, the interface, library, and format support the creation,
+ access, and sharing of scientific data.
+ .
+ This package contains the C run-time shared libraries required
+ by programs.
+
Package: libnetcdf-dev
Architecture: any
Section: libdevel
- Depends: libnetcdf-11 (= ${binary:Version}),
-Depends: libnetcdf12 (= ${binary:Version}),
++Depends: libnetcdf-12 (= ${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,
@@@ -109,49 -78,11 +111,49 @@@ Description: creation, access, and shar
.
This package provides headers.
+Package: libnetcdf-mpi-dev
+Architecture: any
+Section: libdevel
+Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-mpi-11 (= ${binary:Version}),
++ libnetcdf-mpi-12 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends},
+ pkg-config
+Suggests: netcdf-bin, netcdf-doc
+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: libnetcdf-pnetcdf-dev
+Architecture: any
+Section: libdevel
+Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-pnetcdf-11 (= ${binary:Version}),
++ libnetcdf-pnetcdf-12 (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends},
+ pkg-config
+Suggests: netcdf-bin, netcdf-doc
+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
- Depends: libnetcdf-11 (= ${binary:Version}),
- libnetcdf-mpi-11 (= ${binary:Version}),
- libnetcdf-pnetcdf-11 (= ${binary:Version}),
-Depends: libnetcdf12 (= ${binary:Version}),
++Depends: libnetcdf-12 (= ${binary:Version}),
++ libnetcdf-mpi-12 (= ${binary:Version}),
++ libnetcdf-pnetcdf-12 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
diff --cc debian/libnetcdf-12.install
index 0000000,3ddde58..3ddde58
mode 000000,100644..100644
--- a/debian/libnetcdf-12.install
+++ b/debian/libnetcdf-12.install
diff --cc debian/libnetcdf-mpi-12.install
index 1281e64,0000000..1281e64
mode 100644,000000..100644
--- a/debian/libnetcdf-mpi-12.install
+++ b/debian/libnetcdf-mpi-12.install
diff --cc debian/libnetcdf-mpi-12.symbols
index 171f3d5,0000000..171f3d5
mode 100644,000000..100644
--- a/debian/libnetcdf-mpi-12.symbols
+++ b/debian/libnetcdf-mpi-12.symbols
diff --cc debian/libnetcdf-pnetcdf-12.install
index 0184785,0000000..0184785
mode 100644,000000..100644
--- a/debian/libnetcdf-pnetcdf-12.install
+++ b/debian/libnetcdf-pnetcdf-12.install
diff --cc debian/rules
index 3ff527b,640063d..236c683
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,15 +1,14 @@@
#!/usr/bin/make -f
+ #export DH_VERBOSE=1
+
+ # Enable hardening build flags, except:
+ # pie: causes build failure
+ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+
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
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+INCDIR:=/usr/include
UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
--
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