[SCM] mpich.git branch, master, updated. debian/1.4.1-4-45-g1a300b3
Torquil Macdonald Sørensen
torquil at gmail.com
Tue Jul 9 09:15:08 UTC 2013
The following commit has been merged in the master branch:
commit 1a300b35ae5610aca60b7cd8c8da101447006021
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date: Tue Jul 9 11:13:46 2013 +0200
Remove /etc/mpich. Upstream says it's not needed.
diff --git a/debian/libmpich-dev.install b/debian/libmpich-dev.install
index 6894cbf..8a32a2c 100644
--- a/debian/libmpich-dev.install
+++ b/debian/libmpich-dev.install
@@ -1,4 +1,3 @@
-etc/mpich/mpi*.conf
usr/bin/mpicc.*
usr/bin/mpichversion
usr/bin/mpicxx.*
diff --git a/debian/rules b/debian/rules
index 5821cb6..5327fc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,11 +39,10 @@ override_dh_auto_install-arch:
(cd debian/tmp/usr/bin/ && mv $$i $$i.mpich); \
(cd debian/tmp/usr/share/man/man1/ && mv $$i.1 $$i.mpich.1);\
done
- # Fix incorrect paths in /etc/mpich/*.conf and /usr/bin/mpi{cc,cxx,f77,f90}.mpich
- for fn in debian/tmp/etc/mpich/*.conf debian/tmp/usr/bin/mpicc.mpich \
- debian/tmp/usr/bin/mpicxx.mpich debian/tmp/usr/bin/mpif77.mpich \
- debian/tmp/usr/bin/mpif90.mpich; do \
- sed -i 's:$(CURDIR)/debian/tmp/::g' $$fn ;\
+ # Fix incorrect paths in /usr/bin/mpi{cc,cxx,f77,f90}.mpich
+ for fn in debian/tmp/usr/bin/mpicc.mpich debian/tmp/usr/bin/mpicxx.mpich \
+ 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
--
mpich.git
More information about the debian-science-commits
mailing list