Bug#756697: salome-kernel: diff for NMU version 6.5.0-8.1

[Gilles Filippini]

tags 756697 + pending
thanks

Dear maintainer,

I've prepared an NMU for salome-kernel (versioned as 6.5.0-8.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

_g.

diff -u salome-kernel-6.5.0/debian/changelog salome-kernel-6.5.0/debian/changelog
--- salome-kernel-6.5.0/debian/changelog
+++ salome-kernel-6.5.0/debian/changelog
@@ -1,3 +1,10 @@
+salome-kernel (6.5.0-8.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756697).
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 06 Aug 2014 16:33:56 +0200
+
 salome-kernel (6.5.0-8) unstable; urgency=low
 
   * Fix FTBFS with new boost yet again (closes: #735807).
diff -u salome-kernel-6.5.0/debian/rules salome-kernel-6.5.0/debian/rules
--- salome-kernel-6.5.0/debian/rules
+++ salome-kernel-6.5.0/debian/rules
@@ -15,6 +15,18 @@
 
 include /usr/share/quilt/quilt.make
 
+ifneq ($(wildcard /usr/share/mpi-default-dev/debian_defaults),)
+  # Which MPI implementation?
+  # set ARCH_DEFAULT_MPI_IMPL
+  include /usr/share/mpi-default-dev/debian_defaults
+  HDF5_FLAVOR := $(ARCH_DEFAULT_MPI_IMPL)
+else
+  HDF5_FLAVOR := serial
+endif
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(HDF5_FLAVOR)/libhdf5.so),)
+  WITH_HDF5 := --with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(HDF5_FLAVOR)
+endif
+
 clean: unpatch
 	dh_testdir
 	-rm -rf $(builddir) $(builddir)-doc
@@ -61,6 +73,7 @@
 	    --disable-dependency-tracking \
 	    --disable-maintainer-mode \
 	    --with-mpi=/usr --with-mpi_include=/usr/include/mpi \
+	    $(WITH_HDF5) \
 	    --bindir=/usr/lib/salome/bin --libdir=/usr/lib/salome/lib \
 	    --docdir=/usr/share/doc/salome-kernel-doc \
 	    CASROOT=/usr \