[SCM] mpich.git branch, master, updated. debian/1.4.1-4-42-g7a67b58

[Torquil Macdonald Sørensen]

The following commit has been merged in the master branch:
commit 7a67b581ba43981da891969e75e8924fc00f60e9
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Thu Jul 4 22:40:57 2013 +0200

    Updates and a fix related to update-alternatives.

diff --git a/debian/libmpich-dev.postinst b/debian/libmpich-dev.postinst
index 1ceb91a..6763b1b 100644
--- a/debian/libmpich-dev.postinst
+++ b/debian/libmpich-dev.postinst
@@ -24,11 +24,13 @@ update-alternatives \
 	--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 \
+	--slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.mpich \
 	--slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.mpich \
 	--slave /usr/bin/mpif90 mpif90 /usr/bin/mpif90.mpich \
 	--slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz /usr/share/man/man1/mpicc.mpich.1.gz \
 	--slave /usr/share/man/man1/mpic++.1.gz mpic++.1.gz /usr/share/man/man1/mpic++.mpich.1.gz \
 	--slave /usr/share/man/man1/mpicxx.1.gz mpicxx.1.gz /usr/share/man/man1/mpicxx.mpich.1.gz \
+	--slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz /usr/share/man/man1/mpicxx.mpich.1.gz \
 	--slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz /usr/share/man/man1/mpif77.mpich.1.gz \
 	--slave /usr/share/man/man1/mpif90.1.gz mpif90.1.gz /usr/share/man/man1/mpif90.mpich.1.gz
 
diff --git a/debian/mpich.prerm b/debian/mpich.prerm
index da2aaf5..d7e80b1 100644
--- a/debian/mpich.prerm
+++ b/debian/mpich.prerm
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" != "upgrade" ]; then
-	update-alternatives --remove mpirun /usr/bin/mpirun.mpich
+	update-alternatives --remove mpirun /usr/bin/mpirun.hydra
 fi
 
 #DEBHELPER#

-- 
mpich.git