This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf.
commit 57a24df0089b7c6b62526ba112b9bdd908ff8897 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jul 31 13:01:48 2015 +0200 Switch back to building with the HDF5 serial variant instead of MPI only. --- debian/changelog | 2 ++ debian/control | 7 +++---- debian/libnetcdf7.symbols | 1 - debian/rules | 6 ++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0f0899..286cee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ netcdf (1:4.4.0~rc2-1~exp4) UNRELEASED; 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) -- Bas Couwenberg <sebas...@debian.org> Thu, 30 Jul 2015 19:46:45 +0200 diff --git a/debian/control b/debian/control index 7fabf33..cc80e01 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,8 @@ Build-Depends: debhelper (>= 9), m4, doxygen, libjs-jquery, - libhdf5-mpi-dev (>= 1.8.6-1~), - libcurl4-gnutls-dev | libcurl-ssl-dev, - mpi-default-dev + libhdf5-dev (>= 1.8.6-1~), + libcurl4-gnutls-dev | libcurl-ssl-dev Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/netcdf.git Vcs-Git: git://anonscm.debian.org/pkg-grass/netcdf.git @@ -59,7 +58,7 @@ Package: libnetcdf-dev Architecture: any Section: libdevel Depends: libnetcdf7 (= ${binary:Version}), - libhdf5-mpi-dev (>= 1.8.6-1~), + libhdf5-dev (>= 1.8.6-1~), libcurl4-gnutls-dev | libcurl-ssl-dev, ${misc:Depends} Recommends: pkg-config diff --git a/debian/libnetcdf7.symbols b/debian/libnetcdf7.symbols index cd3a04e..5c15ecb 100644 --- a/debian/libnetcdf7.symbols +++ b/debian/libnetcdf7.symbols @@ -717,7 +717,6 @@ libnetcdf.so.7 libnetcdf7 #MINVER# nc_sizevector1@Base 4.3.3 nc_strerror@Base 3.6.1 nc_sync@Base 3.6.1 - nc_use_parallel_enabled@Base 4.3.3 nc_var_par_access@Base 4.0.1 ncabort@Base 3.6.1 ncattcopy@Base 3.6.1 diff --git a/debian/rules b/debian/rules index 16976be..ca38acb 100755 --- a/debian/rules +++ b/debian/rules @@ -4,9 +4,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -include /usr/share/mpi-default-dev/debian_defaults -HDF5_INCLUDE_PATH=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) -HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) +HDF5_INCLUDE_PATH=/usr/include/hdf5/serial +HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') @@ -15,7 +14,6 @@ UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1 override_dh_auto_configure: dh_auto_configure -- \ - -DCMAKE_C_COMPILER=mpicc \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=1 \ -DENABLE_TESTS:BOOL=OFF \ -- 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