tags 756690 + pending thanks Dear maintainer,
I've prepared an NMU for petsc (versioned as 3.4.2.dfsg1-8.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. _g. diff -Nru petsc-3.4.2.dfsg1/debian/changelog petsc-3.4.2.dfsg1/debian/changelog --- petsc-3.4.2.dfsg1/debian/changelog 2014-04-24 19:31:39.000000000 +0200 +++ petsc-3.4.2.dfsg1/debian/changelog 2014-08-06 18:01:01.000000000 +0200 @@ -1,3 +1,10 @@ +petsc (3.4.2.dfsg1-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout (closes: #756690). + + -- Gilles Filippini <p...@debian.org> Wed, 06 Aug 2014 18:00:31 +0200 + petsc (3.4.2.dfsg1-8) unstable; urgency=medium * Team upload. diff -Nru petsc-3.4.2.dfsg1/debian/rules petsc-3.4.2.dfsg1/debian/rules --- petsc-3.4.2.dfsg1/debian/rules 2014-03-04 21:09:33.000000000 +0100 +++ petsc-3.4.2.dfsg1/debian/rules 2014-08-06 18:00:28.000000000 +0200 @@ -41,7 +41,18 @@ # complex) or non-standard distribution (e.g. contrib) is being used. PETSC_EXT=$(shell chmod +x debian/petsc-ext && debian/petsc-ext $(PETSC_ARCH) $(PETSC_MPI) $(DEBIAN_DIST) && chmod -x debian/petsc-ext) -PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi) +# Which MPI implementation? +# set ARCH_DEFAULT_MPI_IMPL +include /usr/share/mpi-default-dev/debian_defaults + +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),) + HDF5_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) + HDF5_LIB := $(HDF5_DIR)/libhdf5.so +else + HDF5_DIR := /usr + HDF5_LIB := $(HDF5_DIR)/lib/$(DEB_HOST_MULTIARCH)/libhdf5.so +endif +PETSC_HDF5_FLAGS=$(shell if [ -e $(HDF5_LIB) ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_DIR)"; fi) PETSC_BABEL_FLAGS=$(shell if [ -e /usr/lib/libsidl.so ]; then echo "--with-babel=1 --with-babel-dir=/usr"; fi) # PETSC_VERSION is used for the package names, library sonames, and @@ -423,7 +434,7 @@ echo "Unknown MPI implementation, stopping"; \ exit 1; \ fi - if [ -e /usr/lib/libhdf5.so ]; then \ + if [ -e $(HDF5_LIB) ]; then \ echo "hdf5-dev=libhdf5-mpi-dev" >> debian/lib$(PETSC_NAME)-dev.substvars; \ else \ echo "hdf5-dev=" >> debian/lib$(PETSC_NAME)-dev.substvars; \ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org