[SCM] hdf5 branch, master, updated. debian/1.8.12-2-7-g5bac55a

[Gilles Filippini]

The following commit has been merged in the master branch:
commit 7a2132bce5f4f7f7cd7720a1c0f84ba230f7b94c
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Dec 31 10:42:40 2013 +0100

    Simplify DEFAULT_MPI retrieval in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 114facc..d952a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdf5 (1.8.12-3) UNRELEASED; urgency=medium
+
+  * Simplify DEFAULT_MPI retrieval in debina/rules.
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 31 Dec 2013 10:41:51 +0100
+
 hdf5 (1.8.12-2) experimental; urgency=low
 
   * Re-enable openmpi for arm64 (from 1.8.11-5ubuntu2).
diff --git a/debian/rules b/debian/rules
index 79e5fe0..f627002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,10 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
 
-DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//")
+ifneq (,$(wildcard /usr/share/mpi-default-dev/debian_defaults))
+include /usr/share/mpi-default-dev/debian_defaults 
+endif
+DEFAULT_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 
 # To be used if binary packages were buildable on any arch
 #ARCH_FLAG=-a

-- 
Hierarchical Data Format 5 (HDF5)