[SCM] mpich.git branch, master, updated. debian/1.4.1-4-43-g4bb87c6

[Torquil Macdonald Sørensen]

The following commit has been merged in the master branch:
commit 4bb87c6afe20b15c350451b542da727c40a1fa65
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Mon Jul 8 17:02:37 2013 +0200

    Make libmpich-dev.postinst multiarch compatible.

diff --git a/debian/libmpich-dev.postinst b/debian/libmpich-dev.postinst
index 6763b1b..64922c2 100644
--- a/debian/libmpich-dev.postinst
+++ b/debian/libmpich-dev.postinst
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+# This is a template file for libmpich-dev.postinst, since it will be processed
+# by debian/rules. The update-alternatives command below needs the path to the
+# lib*.so files, which depends on the multiarch triplet. This can be gotten
+# from dpkg-architecture, but to avoid dependence on dpkg-dev, we instead
+# determine it at package build-time, and include a processed version of this
+# file as the libmpich-dev.postinst, where the variable triplet has been replaced
+# by its appropriate value, depending on the build host architecture.
+
 set -e
 
 case "$1" in
@@ -17,10 +25,10 @@ esac
 
 update-alternatives \
 	--install /usr/include/mpi mpi /usr/include/mpich 40 \
-	--slave /usr/lib/libmpi.so libmpi.so /usr/lib/libmpich.so \
-	--slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/libmpichcxx.so \
-	--slave /usr/lib/libmpif77.so libmpif77.so /usr/lib/libfmpich.so \
-	--slave /usr/lib/libmpif90.so libmpif90.so /usr/lib/libmpichf90.so \
+	--slave /usr/lib/libmpi.so libmpi.so /usr/lib/TRIPLET/libmpich.so \
+	--slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/TRIPLET/libmpichcxx.so \
+	--slave /usr/lib/libmpif77.so libmpif77.so /usr/lib/TRIPLET/libfmpich.so \
+	--slave /usr/lib/libmpif90.so libmpif90.so /usr/lib/TRIPLET/libmpichf90.so \
 	--slave /usr/bin/mpicc mpicc /usr/bin/mpicc.mpich \
 	--slave /usr/bin/mpic++ mpic++ /usr/bin/mpic++.mpich \
 	--slave /usr/bin/mpicxx mpicxx /usr/bin/mpicxx.mpich \
diff --git a/debian/rules b/debian/rules
index 53cf504..5821cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,3 +49,8 @@ override_dh_auto_install-arch:
 
 override_dh_installchangelogs:
 	dh_installchangelogs README
+
+# Correct lib*.so multiarch paths in libmpich-dev.postinst
+override_dh_installdeb:
+	dh_installdeb
+	sed -i 's:TRIPLET:$(DEB_HOST_MULTIARCH):g' debian/libmpich-dev/DEBIAN/postinst

-- 
mpich.git