[SCM] mpich.git branch, master, updated. debian/1.4.1-4-40-gf84b102

[Torquil Macdonald Sørensen]

The following commit has been merged in the master branch:
commit f84b102d65c1ed639b7316b5a182f62237635ca6
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Wed Jul 3 19:33:42 2013 +0200

    Remove unneeded links for manpages and mpiexec.

diff --git a/debian/mpich.install b/debian/mpich.install
index 8dc7e35..1795969 100644
--- a/debian/mpich.install
+++ b/debian/mpich.install
@@ -1,3 +1,2 @@
-usr/bin/hydra*
-usr/bin/mpiexec*
-usr/bin/mpirun*
+usr/bin/hydra_*
+usr/bin/mpiexec.*
diff --git a/debian/mpich.links b/debian/mpich.links
deleted file mode 100644
index 35a4ae6..0000000
--- a/debian/mpich.links
+++ /dev/null
@@ -1 +0,0 @@
-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 6c46a91..3edb2b6 100644
--- a/debian/mpich.manpages
+++ b/debian/mpich.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/mpiexec.mpich.1
+debian/tmp/usr/share/man/man1/mpiexec.hydra.1
diff --git a/debian/mpich.postinst b/debian/mpich.postinst
index 1633d69..bd20d75 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/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
+	--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
 
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index b13c158..53cf504 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,7 @@ override_dh_auto_install-arch:
 	    debian/tmp/usr/bin/mpif90.mpich; do \
 	  sed -i 's:$(CURDIR)/debian/tmp/::g' $$fn ;\
 	done
-	mv debian/tmp/usr/bin/mpiexec debian/tmp/usr/bin/mpiexec.mpich
-	mv debian/tmp/usr/bin/mpirun debian/tmp/usr/bin/mpirun.mpich
-	mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.mpich.1
+	mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.hydra.1
 
 override_dh_installchangelogs:
 	dh_installchangelogs README

-- 
mpich.git