Skip to content
Commits on Source (39)
netcdf (1:4.4.1-1) UNRELEASED; urgency=medium
netcdf (1:4.4.1-3) UNRELEASED; urgency=medium
* Add mpi, pnetcdf variants of netcdf. Closes: #708638.
* use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
* Build-depend on libpnetcdf-dev
* Enable MMAP in diskless.
* DH_COMPAT=10
* Remove -dbg package now we have -dbgsym packages
-- Alastair McKinstry <mckinstry@debian.org> Tue, 19 Apr 2016 00:54:19 +0100
netcdf (1:4.4.1-2) unstable; urgency=medium
* Add patch to fix HDF5 include directory with CMake >= 3.6.0.
(closes: #835710)
* Add patch to fix spelling errors.
-- Bas Couwenberg <sebastic@debian.org> Sun, 28 Aug 2016 15:47:11 +0200
netcdf (1:4.4.1-1) unstable; urgency=medium
* New upstream release.
* Update copyright years in copyright file.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Wed, 29 Jun 2016 00:59:22 +0200
netcdf (1:4.4.1~rc3-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Drop source_date_epoch.patch, applied upstream.
* Update watch file to handle more tag conventions in filenamemangle.
-- Bas Couwenberg <sebastic@debian.org> Tue, 21 Jun 2016 07:44:10 +0200
netcdf (1:4.4.1~rc2-1~exp3) experimental; urgency=medium
* Add patch to use SOURCE_DATE_EPOCH instead of current date.
* Add patch to make the libnetcdf.settings file reproducible.
-- Bas Couwenberg <sebastic@debian.org> Sun, 05 Jun 2016 19:00:43 +0200
netcdf (1:4.4.1~rc2-1~exp2) experimental; urgency=medium
* Drop SOVERSION patch, SONAME bump in RC1 was not required.
-- Bas Couwenberg <sebastic@debian.org> Sun, 15 May 2016 13:01:19 +0200
netcdf (1:4.4.1~rc2-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Refresh patches.
* Add patch to fix tst_fileinfo linking to libhdf5.
* Add patch to revert SOVERSION decrement.
* Update symbols for 4.4.1-rc2.
-- Bas Couwenberg <sebastic@debian.org> Sat, 14 May 2016 13:35:06 +0200
netcdf (1:4.4.1~rc1-1) experimental; urgency=medium
* New upstream release candidate.
......
......@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
Alastair McKinstry <mckinstry@debian.org>
Section: science
Priority: optional
Build-Depends: debhelper (>= 10),
Build-Depends: debhelper (>= 9),
cmake (>= 2.8.12),
chrpath,
m4,
......
......@@ -10,7 +10,7 @@ Copyright: 1988-2016, University Corporation for Atmospheric Research/Unidata
License: NetCDF
Files: ltmain.sh
Copyright: 1996-2011, Free Software Foundation, Inc
Copyright: 1996-2015, Free Software Foundation, Inc
License: GPL-2+ with Libtool exception
Files: include/XGetopt.h
......@@ -40,7 +40,7 @@ Files: libdap2/dcetab.c
ncgen3/ncgentab.h
oc2/dapy.c
oc2/dapy.h
Copyright: 1984, 1989-1990, 2000-2013, Free Software Foundation, Inc
Copyright: 1984, 1989-1990, 2000-2015, Free Software Foundation, Inc
License: GPL-3+ with Bison exception
Files: include/utf8proc.h
......
libnetcdf.so.11 libnetcdf11-mpi #MINVER#
libnetcdf_mpi.so.11 libnetcdf11-mpi #MINVER#
Cde2h@NETCDF_MPI_4.1.3 4.4.0
Cdh2e@NETCDF_MPI_4.1.3 4.4.0
DAPparse@NETCDF_MPI_4.1.3 4.4.0
......@@ -122,9 +122,6 @@ libnetcdf.so.11 libnetcdf11-mpi #MINVER#
NCDEFAULT_put_vars@NETCDF_MPI_4.1.3 4.4.0
NCDISPATCH_finalize@NETCDF_MPI_4.4.0 4.4.0
NCDISPATCH_initialize@NETCDF_MPI_4.1.3 4.4.0
NCSUBSTRATE_dispatch_table@NETCDF_MPI_4.1.3 4.4.0
NCSUBSTRATE_finalize@NETCDF_MPI_4.4.0 4.4.0
NCSUBSTRATE_initialize@NETCDF_MPI_4.1.3 4.4.0
NC_argc@NETCDF_MPI_4.4.0 4.4.0
NC_argv@NETCDF_MPI_4.4.0 4.4.0
NC_atomictypelen@NETCDF_MPI_4.1.3 4.4.0
......@@ -136,12 +133,10 @@ libnetcdf.so.11 libnetcdf11-mpi #MINVER#
NC_coord_one@NETCDF_MPI_4.1.3 4.4.0
NC_coord_zero@NETCDF_MPI_4.1.3 4.4.0
NC_create@NETCDF_MPI_4.1.3 4.4.0
NC_dispatch_overlay@NETCDF_MPI_4.1.3 4.4.0
NC_finalized@NETCDF_MPI_4.4.0 4.4.0
NC_findattr@NETCDF_MPI_4.1.3 4.4.0
NC_findtestserver@NETCDF_MPI_4.1.3 4.4.0
NC_findvar@NETCDF_MPI_4.1.3 4.4.0
NC_get_dispatch_override@NETCDF_MPI_4.1.3 4.4.0
NC_get_vara@NETCDF_MPI_4.1.3 4.4.0
NC_getshape@NETCDF_MPI_4.1.3 4.4.0
NC_initialized@NETCDF_MPI_4.4.0 4.4.0
......@@ -149,7 +144,6 @@ libnetcdf.so.11 libnetcdf11-mpi #MINVER#
NC_is_recvar@NETCDF_MPI_4.1.3 4.4.0
NC_lookupvar@NETCDF_MPI_4.1.3 4.4.0
NC_open@NETCDF_MPI_4.1.3 4.4.0
NC_set_dispatch_override@NETCDF_MPI_4.1.3 4.4.0
NC_sync@NETCDF_MPI_4.1.3 4.4.0
NC_testurl@NETCDF_MPI_4.1.3 4.4.0
NC_urlmodel@NETCDF_MPI_4.1.3 4.4.0
......
This diff is collapsed.
usr/lib/*/libnetcdf.so.*
......@@ -55,11 +55,15 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
NC4_def_vlen@Base 4.1.3
NC4_del_att@Base 4.1.3
NC4_dispatch_table@Base 4.1.3
NC4_fileinfo_init@Base 4.4.1~rc2
NC4_finalize@Base 4.4.0~rc4
NC4_get_att@Base 4.1.3
NC4_get_fileinfo@Base 4.4.1~rc2
NC4_get_var_chunk_cache@Base 4.1.3
NC4_get_vara@Base 4.1.3
NC4_get_vlen_element@Base 4.1.3
NC4_hdf5get_libversion@Base 4.4.1~rc2
NC4_hdf5get_superblock@Base 4.4.1~rc2
NC4_initialize@Base 4.1.3
NC4_inq@Base 4.1.3
NC4_inq_att@Base 4.1.3
......@@ -94,8 +98,10 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
NC4_insert_array_compound@Base 4.1.3
NC4_insert_compound@Base 4.1.3
NC4_insert_enum@Base 4.1.3
NC4_isnetcdf4@Base 4.4.1~rc2
NC4_open@Base 4.1.3
NC4_put_att@Base 4.1.3
NC4_put_propattr@Base 4.4.1~rc2
NC4_put_vara@Base 4.1.3
NC4_put_vlen_element@Base 4.1.3
NC4_redef@Base 4.1.3
......@@ -108,6 +114,7 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
NC4_set_var_chunk_cache@Base 4.1.3
NC4_show_metadata@Base 4.1.3
NC4_sync@Base 4.1.3
NC4_test_netcdf4@Base 4.4.1~rc2
NC4_var_par_access@Base 4.1.3
NCD2_close@Base 4.3.3
NCD2_def_compound@Base 4.4.1~rc1
......@@ -183,6 +190,9 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
NCDISPATCH_get_att@Base 4.4.1~rc1
NCDISPATCH_initialize@Base 4.3.3
NCDISPATCH_inq_var_all@Base 4.4.1~rc1
NC_RESERVED_ATT_LIST@Base 4.4.1~rc2
NC_RESERVED_SPECIAL_LIST@Base 4.4.1~rc2
NC_RESERVED_VARATT_LIST@Base 4.4.1~rc2
NC_argc@Base 4.4.0~rc4
NC_argv@Base 4.4.0~rc4
NC_atomictypelen@Base 4.1.3
......@@ -402,11 +412,13 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
function@Base 4.1.3
getalldims@Base 4.3.3
getlimitnumber@Base 4.1.3
globalpropinfo@Base 4.4.1~rc2
hash_fast@Base 4.1.3
indexer@Base 4.1.3
indexpath@Base 4.1.3
int_cmp@Base 4.1.3
iscached@Base 4.1.3
iterate_NCList@Base 4.4.1~rc2
makecdfnode@Base 4.3.3
makecdfpathstring@Base 4.3.3
makeocpathstring@Base 4.3.3
......@@ -454,6 +466,7 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
nc4_get_vara@Base 4.0.1
nc4_grp_list_add@Base 4.0.1
nc4_hdf5_initialize@Base 4.4.1~rc1
nc4_hdf5_initialized@Base 4.4.1~rc2
nc4_nc4f_list_add@Base 4.0.1
nc4_normalize_name@Base 4.0.1
nc4_open_var_grp2@Base 4.0.1
......@@ -1464,6 +1477,8 @@ libnetcdf.so.11 #PACKAGE# #MINVER#
read_numrecs@Base 3.6.1
rec_detach_scales@Base 4.3.3
rec_reattach_scales@Base 4.3.3
reportobject@Base 4.4.1~rc2
reportopenobjects@Base 4.4.1~rc2
restruct@Base 4.3.3
segment@Base 4.1.3
segmentlist@Base 4.1.3
......
Description: Fix HDF5 include directory with CMake >= 3.6.0.
HDF5_INCLUDE_DIR has been deprecated some time ago,
only HDF5_INCLUDE_DIRS is set for CMake >= 3.6.0.
Author: Bas Couwenberg <sebastic@debian.org>
Bug-Debian: https://bugs.debian.org/835710
Forwarded: https://github.com/Unidata/netcdf-c/pull/311
Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/4d0c0556772e7be1603f1d74d9ee17579be67148
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -572,6 +572,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
##
# Include the HDF5 include directory.
##
+ IF(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
+ SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
+ ENDIF()
+ MESSAGE(STATUS "Using HDF5 include dir: ${HDF5_INCLUDE_DIR}")
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
###
......@@ -5,10 +5,8 @@ Description: Append HDF5 library & include paths to nc-config & netcdf.pc.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
Index: netcdf-4.4.1~rc1/CMakeLists.txt
===================================================================
--- netcdf-4.4.1~rc1.orig/CMakeLists.txt
+++ netcdf-4.4.1~rc1/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1599,6 +1599,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
......
......@@ -6,4 +6,6 @@ reproducible.patch
hdf5-library-path.patch
hdf5-location.patch
pnetcdf-settings.patch
tst-fix.patch
hdf5-include-path.patch
tst_fileinfo-link-hdf5.patch
spelling-errors.patch
Description: Fix spelling errors.
characers -> characters
varaible -> variable
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: https://github.com/Unidata/netcdf-c/pull/312
Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/988b4ff868e1eb9a169d8c41e9fd133692590e59
Index: netcdf-4.4.1/ncgen/ncgen.1
===================================================================
--- netcdf-4.4.1.orig/ncgen/ncgen.1
+++ netcdf-4.4.1/ncgen/ncgen.1
@@ -864,7 +864,7 @@ There are three other cases of note.
.IP 1. 3
If there is only a single, unlimited dimension,
then all of the constants are concatenated
-and fill characers are added to the
+and fill characters are added to the
end of the resulting string to make its
length be that of the unlimited dimension.
If the length is larger than
Index: netcdf-4.4.1/docs/netcdf.m4
===================================================================
--- netcdf-4.4.1.orig/docs/netcdf.m4
+++ netcdf-4.4.1/docs/netcdf.m4
@@ -774,15 +774,15 @@ Learn about a compound type.
.HP
FDECL(def_vlen, (INCID(), INAME(), INCTYPE(base_typeid), ONCTYPE(xtypep)))
.sp
-Create a varaible length array type.
+Create a variable length array type.
.HP
FDECL(inq_vlen, (INCID(), INCTYPE(), ONAME(), OSIZET(datum_sizep), ONCTYPE(base_nc_typep)))
.sp
-Learn about a varaible length array type.
+Learn about a variable length array type.
.HP
FDECL(free_vlen, (nc_vlen_t *vl))
.sp
-Free memory comsumed by reading data of a varaible length array type.
+Free memory comsumed by reading data of a variable length array type.
.HP
FDECL(put_vlen_element, (INCID(), INCTYPE(), IVOIDP(vlen_element), ISIZET(len), IVOIDP(data)))
.sp
Index: netcdf-4.4.1/docs/old/netcdf-f90.texi
===================================================================
--- netcdf-4.4.1.orig/docs/old/netcdf-f90.texi
+++ netcdf-4.4.1/docs/old/netcdf-f90.texi
@@ -5180,7 +5180,7 @@ rh in an existing netCDF dataset named f
@findex NF90_INQ_VARID
@cindex NF90_INQ_VARID, example
-Given the name of a varaible, nf90_inq_varid finds the variable ID.
+Given the name of a variable, nf90_inq_varid finds the variable ID.
@heading Usage
@example
Index: netcdf-4.4.1/libsrc/netcdf.3
===================================================================
--- netcdf-4.4.1.orig/libsrc/netcdf.3
+++ netcdf-4.4.1/libsrc/netcdf.3
@@ -341,15 +341,15 @@ Learn about a compound type.
.HP
\fBint nc_def_vlen(int \fIncid\fP, const char \fIname\fP[], nc_type \fIbase_typeid\fP, nc_type* \fIxtypep\fP)\fR
.sp
-Create a varaible length array type.
+Create a variable length array type.
.HP
\fBint nc_inq_vlen(int \fIncid\fP, nc_type \fI\fP, char \fIname\fP[], size_t* \fIdatum_sizep\fP, nc_type* \fIbase_nc_typep\fP)\fR
.sp
-Learn about a varaible length array type.
+Learn about a variable length array type.
.HP
\fBint nc_free_vlen(nc_vlen_t *vl)\fR
.sp
-Free memory comsumed by reading data of a varaible length array type.
+Free memory comsumed by reading data of a variable length array type.
.HP
\fBint nc_put_vlen_element(int \fIncid\fP, nc_type \fI\fP, void * \fIvlen_element\fP, size_t \fIlen\fP, void * \fIdata\fP)\fR
.sp
Description: Fix linking to libhdf5 in addition to libnetcdf.
Build failed with:
/usr/bin/cc -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now CMakeFiles/tst_fileinfo.dir/tst_fileinfo.c.o -o tst_fileinfo -rdynamic ../liblib/libnetcdf.so.11.2.0 -Wl,-rpath,"/build/netcdf-4.4.1~rc2/obj-x86_64-linux-gnu/liblib"
/usr/bin/ld: CMakeFiles/tst_fileinfo.dir/tst_fileinfo.c.o: undefined reference to symbol 'H5check_version@@HDF5_SERIAL_1.8.7'
//usr/lib/x86_64-linux-gnu/libhdf5_serial.so.10: error adding symbols: DSO missing from command line
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
--- a/ncdump/CMakeLists.txt
+++ b/ncdump/CMakeLists.txt
@@ -62,6 +62,21 @@ IF(ENABLE_TESTS)
IF(ENABLE_FILEINFO)
ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
+ IF(USE_HDF5 OR USE_NETCDF4)
+ # Some version of cmake define HDF5_hdf5_LIBRARY instead of
+ # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES
+ IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES)
+ SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY})
+ ENDIF()
+ IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES)
+ SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY})
+ ENDIF()
+ # The order of the libraries is important here for static
+ # builds:
+ # Make sure that HDF5_C_LIBRARY appears *after*
+ # HDF5_HL_LIBRARY.
+ TARGET_LINK_LIBRARIES(tst_fileinfo ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
+ ENDIF()
add_sh_test(ncdump tst_fileinfo)
ENDIF()
......@@ -92,17 +92,21 @@ override_dh_auto_install:
dh_link -p libnetcdf-$$d-$(SO_MAJOR) $(LIBDIR)/libnetcdf_$$d.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_$$d.so.$(SO_MAJOR) ; \
dh_link -p libnetcdf-$$d-dev $(LIBDIR)/netcdf/$$d $(LIBDIR)/netcdf/$$d/lib ; \
dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \
dh_link -p libnetcdf-$$-dev $(LIBDIR)/pkgconfig/netcdf-$$d.pc $(LIBDIR)/netcdf/$$d/pkgconfig/netcdf.pc ;\
done
# Serial; one-off only
echo "prefix=$(LIBDIR)/netcdf/serial" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc
grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc
cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR)
ln -s libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR)/libnetcdf.so.$(SO_MAJOR)
ln -s libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR)/libnetcdf.so
cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF
cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr
cp -a debian/tmp-serial/usr/share debian/tmp/usr
cp -a debian/tmp-serial/usr/bin debian/tmp/usr
dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so
dh_link -p libnetcdf$(SO_MAJOR) $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/libnetcdf.so.$(SO_MAJOR)
dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/libnetcdf.so
dh_link -p libnetcdf-dev $(LIBDIR)/pkgconfig/netcdf-serial.pc $(LIBDIR)/netcdf/serial/pkgconfig/netcdf.pc ;\
$(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-dev.postinst.in \
> debian/libnetcdf-dev.postinst
......@@ -113,9 +117,7 @@ override_dh_auto_install:
dh_link -p libnetcdf-dev /usr/include $(LIBDIR)/netcdf/serial/include
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
ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo "Ignoring test failures"
# Disable tests for pnetcdf. Multiple failures in nc_test where char conversions give:
# test_put.c: NetCDF: Numeric conversion not representablea
# This for 1.7.0pre1
......
......@@ -2,6 +2,6 @@ version=3
opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|gamma|beta|alpha|b|a)[\-\.]?(\d*))$/$1~$3$4/;s/RC/rc/,\
filenamemangle=s/(?:.*?)?[vr]?(\d[\d\.\-\w]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/netcdf-c-$1.$2/ \
filenamemangle=s/(?:.*?\/)?(?:rel|v|r|netcdf-c)?[\-\_]?(\d[\d\-\.\w]+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/netcdf-c-$1.$2/ \
https://github.com/Unidata/netcdf-c/releases \
(?:.*/)*(?:rel|v|r|netcdf-c|)[\-\_]?(\d[\d\-\.\w]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
(?:.*/)*(?:rel|v|r|netcdf-c)?[\-\_]?(\d[\d\-\.\w]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))