[SCM] mpich.git branch, master, updated. debian/1.4.1-4-54-gdb82b5e

[Torquil Macdonald Sørensen]

The following commit has been merged in the master branch:
commit db82b5e07062e5b17c7eb948c8f030ef75e241b3
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Wed Jul 10 12:43:25 2013 +0200

    Use .mpich ending for files pointed to from /etc/alternatives.

diff --git a/debian/mpich.links b/debian/mpich.links
new file mode 100644
index 0000000..4c747e6
--- /dev/null
+++ b/debian/mpich.links
@@ -0,0 +1,4 @@
+usr/bin/mpiexec.hydra usr/bin/mpiexec.mpich
+usr/bin/mpiexec.hydra usr/bin/mpirun.mpich
+usr/share/man/man1/mpiexec.mpich.1.gz usr/share/man/man1/mpiexec.hydra.1.gz
+usr/share/man/man1/mpiexec.mpich.1.gz usr/share/man/man1/mpirun.mpich.1.gz
diff --git a/debian/mpich.manpages b/debian/mpich.manpages
index 3edb2b6..6c46a91 100644
--- a/debian/mpich.manpages
+++ b/debian/mpich.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/mpiexec.hydra.1
+debian/tmp/usr/share/man/man1/mpiexec.mpich.1
diff --git a/debian/mpich.postinst b/debian/mpich.postinst
index bd20d75..1633d69 100644
--- a/debian/mpich.postinst
+++ b/debian/mpich.postinst
@@ -30,10 +30,10 @@ if update-alternatives --list mpiexec > /dev/null 2>&1; then
 fi
 
 update-alternatives \
-	--install /usr/bin/mpirun mpirun /usr/bin/mpiexec.hydra 40 \
-	--slave /usr/share/man/man1/mpirun.1.gz mpirun.1.gz /usr/share/man/man1/mpiexec.hydra.1.gz \
-	--slave /usr/bin/mpiexec mpiexec /usr/bin/mpiexec.hydra \
-	--slave /usr/share/man/man1/mpiexec.1.gz mpiexec.1.gz /usr/share/man/man1/mpiexec.hydra.1.gz
+	--install /usr/bin/mpirun mpirun /usr/bin/mpirun.mpich 40 \
+	--slave /usr/share/man/man1/mpirun.1.gz mpirun.1.gz /usr/share/man/man1/mpirun.mpich.1.gz \
+	--slave /usr/bin/mpiexec mpiexec /usr/bin/mpiexec.mpich \
+	--slave /usr/share/man/man1/mpiexec.1.gz mpiexec.1.gz /usr/share/man/man1/mpiexec.mpich.1.gz
 
 #DEBHELPER#
 
diff --git a/debian/mpich.prerm b/debian/mpich.prerm
index d7e80b1..da2aaf5 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.hydra
+	update-alternatives --remove mpirun /usr/bin/mpirun.mpich
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index e6d266e..b66acc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ override_dh_auto_install-arch:
 		debian/tmp/usr/bin/mpif77.mpich debian/tmp/usr/bin/mpif90.mpich; do \
 		sed -i 's:$(CURDIR)/debian/tmp/::g' $$fn ;\
 	done
-	mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.hydra.1
+	mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.mpich.1
 
 override_dh_installchangelogs:
 	dh_installchangelogs README

-- 
mpich.git