Bug#512426: patch for this bug

2009-01-22 Thread Alexandre Fayolle 
On Thursday 22 January 2009 04:55:01 Adam C Powell IV wrote:
 On Wed, 2009-01-21 at 18:41 +0100, Alexandre Fayolle wrote:
  Here's a patch (generated with debdiff)  that fixes the issue and a
  similar one with the -mpd version of mpich, as well as a couple of
  lintian warnings.
 
  I can make an upload if this is ok with you.

 Thank you, that's fine with me.

 Are you in the pkg-scicomp Alioth group?  If so, feel free to change the
 maintainer to Debian Scientific Computing Team (I think that's the full
 name), and add me and you as uploaders, so it is not an NMU.  This would
 also close the RFA wnpp bug.

Not sure if I'm in, but it certainly won't hurt to ask for inclusion. I'll do 
that today. 

Cheers,

-- 
Alexandre Fayolle  LOGILAB, Paris (France)
Formations Python, Zope, Plone, Debian:  http://www.logilab.fr/formations
Développement logiciel sur mesure:   http://www.logilab.fr/services
Informatique scientifique:   http://www.logilab.fr/science


signature.asc
Description: This is a digitally signed message part.

Bug#512426: patch for this bug

2009-01-21 Thread Alexandre Fayolle 
Here's a patch (generated with debdiff)  that fixes the issue and a similar 
one with the -mpd version of mpich, as well as a couple of lintian warnings. 

I can make an upload if this is ok with you. 

-- 
Alexandre Fayolle  LOGILAB, Paris (France)
Formations Python, Zope, Plone, Debian:  http://www.logilab.fr/formations
Développement logiciel sur mesure:   http://www.logilab.fr/services
Informatique scientifique:   http://www.logilab.fr/science
diff -u mpich-1.2.7/debian/changelog mpich-1.2.7/debian/changelog
--- mpich-1.2.7/debian/changelog
+++ mpich-1.2.7/debian/changelog
@@ -1,3 +1,12 @@
+mpich (1.2.7-8.1) unstable; urgency=low
+
+  * NMU 
+  * Fix update-alternative settings for libmpich-mpd1.0-dev and
+libmpich-shmem1.0-dev (closes: #512426)
+  * fix lintian warning about maintainer scripts ignoring errors
+
+ -- Alexandre Fayolle afayo...@debian.org  Wed, 21 Jan 2009 12:58:11 +0100
+
 mpich (1.2.7-8) unstable; urgency=low
 
   * libmpich1.0-dev conflicts with older mpich-bin because of (formerly
diff -u mpich-1.2.7/debian/libmpich1.0-dev.prerm.in mpich-1.2.7/debian/libmpich1.0-dev.prerm.in
--- mpich-1.2.7/debian/libmpich1.0-dev.prerm.in
+++ mpich-1.2.7/debian/libmpich1.0-dev.prerm.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ $1 != upgrade ] ; then 
   update-alternatives --remove mpi /usr/lib/#MPICH#/include
 fi;
diff -u mpich-1.2.7/debian/libmpich1.0-dev.postinst.in mpich-1.2.7/debian/libmpich1.0-dev.postinst.in
--- mpich-1.2.7/debian/libmpich1.0-dev.postinst.in
+++ mpich-1.2.7/debian/libmpich1.0-dev.postinst.in
@@ -18,10 +18,10 @@
 
 update-alternatives \
 --install /usr/include/mpi mpi /usr/lib/#MPICH#/include 10 \
---slave /usr/lib/libmpi.a libmpi.a /usr/lib/#MPICH#/lib/libmpich.a \
---slave /usr/lib/libmpi.so libmpi.so /usr/lib/#MPICH#/lib/shared/libmpich.so \
---slave /usr/lib/libmpi++.a libmpi++.a /usr/lib/#MPICH#/lib/libpmpich++.a \
---slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/#MPICH#/lib/shared/libpmpich++.so \
+--slave /usr/lib/libmpi.a libmpi.a /usr/lib/#MPICH#/lib/lib#MPICH#.a \
+--slave /usr/lib/libmpi.so libmpi.so /usr/lib/#MPICH#/lib/shared/lib#MPICH#.so \
+--slave /usr/lib/libmpi++.a libmpi++.a /usr/lib/#MPICH#/lib/libp#MPICH#++.a \
+--slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/#MPICH#/lib/shared/libp#MPICH#++.so \
 --slave /usr/bin/mpicc mpicc /usr/bin/mpicc.#MPICH# \
 --slave /usr/bin/mpiCC mpiCC /usr/bin/mpiCC.#MPICH# \
 --slave /usr/bin/mpicxx mpicxx /usr/bin/mpicxx.#MPICH# \
diff -u mpich-1.2.7/debian/mpi-doc.prerm mpich-1.2.7/debian/mpi-doc.prerm
--- mpich-1.2.7/debian/mpi-doc.prerm
+++ mpich-1.2.7/debian/mpi-doc.prerm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ $1 != upgrade ] ; then 
   update-alternatives --remove MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_mpi-doc.3.gz
 fi;
diff -u mpich-1.2.7/debian/rules mpich-1.2.7/debian/rules
--- mpich-1.2.7/debian/rules
+++ mpich-1.2.7/debian/rules
@@ -73,6 +73,7 @@
 	sed 's/#MPICH#/'$$INST'/g'  debian/libmpich1.0-dev.$$FILES.in debian/lib$$INST1.0-dev.$$FILES;\
 	done;\
 	  done;\
+	 sed -i 's/\(.*lib.*\)mpich-mpd\([^/]\)/\1mpich-p4mpd\2/' debian/libmpich-mpd1.0-dev.postinst;\
 	)
 	echo usr/lib/mpich-mpd/bin/mpichboot usr/bin/mpichboot  debian/mpich-mpd-bin.links
 	echo usr/lib/mpich-mpd/bin/mpichstop usr/bin/mpichstop  debian/mpich-mpd-bin.links
diff -u mpich-1.2.7/debian/mpich-bin.preinst.in mpich-1.2.7/debian/mpich-bin.preinst.in
--- mpich-1.2.7/debian/mpich-bin.preinst.in
+++ mpich-1.2.7/debian/mpich-bin.preinst.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 case $1 in
upgrade)
 
diff -u mpich-1.2.7/debian/mpich-bin.prerm.in mpich-1.2.7/debian/mpich-bin.prerm.in
--- mpich-1.2.7/debian/mpich-bin.prerm.in
+++ mpich-1.2.7/debian/mpich-bin.prerm.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ $1 != upgrade ] ; then 
   update-alternatives --remove mpirun /usr/bin/mpirun.#MPICH#
 fi;


signature.asc
Description: This is a digitally signed message part.

Bug#512426: patch for this bug

2009-01-21 Thread Adam C Powell IV 
On Wed, 2009-01-21 at 18:41 +0100, Alexandre Fayolle wrote:
 Here's a patch (generated with debdiff)  that fixes the issue and a similar 
 one with the -mpd version of mpich, as well as a couple of lintian warnings. 
 
 I can make an upload if this is ok with you. 

Thank you, that's fine with me.

Are you in the pkg-scicomp Alioth group?  If so, feel free to change the
maintainer to Debian Scientific Computing Team (I think that's the full
name), and add me and you as uploaders, so it is not an NMU.  This would
also close the RFA wnpp bug.

-Adam
-- 
GPG fingerprint: D54D 1AEE B11C CE9B A02B  C5DD 526F 01E8 564E E4B6

Engineering consulting with open source tools
http://www.opennovation.com/


signature.asc
Description: This is a digitally signed message part