[Pkg-openmpi-commits] r211 - in /openmpi/trunk/debian: changelog openmpi-bin.postinst openmpi-bin.preinst openmpi-bin.prerm

[manuel at users.alioth.debian.org]

Author: manuel
Date: Mon Dec  7 22:47:52 2009
New Revision: 211

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=211
Log:
Applied debdiff from Lucas' NMU

Removed:
    openmpi/trunk/debian/openmpi-bin.preinst
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/openmpi-bin.postinst
    openmpi/trunk/debian/openmpi-bin.prerm

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=211&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Dec  7 22:47:52 2009
@@ -1,3 +1,10 @@
+openmpi (1.3.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload with the maintainer's permission.
+  * Improve alternatives upgrade.
+
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 19 Nov 2009 16:44:20 -0600
+
 openmpi (1.3.3-3) unstable; urgency=low
 
   * Removed mpiexec alternative, as discussed in #552429. It is now a slave

Modified: openmpi/trunk/debian/openmpi-bin.postinst
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.postinst?rev=211&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.postinst (original)
+++ openmpi/trunk/debian/openmpi-bin.postinst Mon Dec  7 22:47:52 2009
@@ -2,7 +2,26 @@
 
 set -e
 
-update-alternatives --quiet --remove-all mpiexec >/dev/null 2>&1 || true
+case "$1" in
+   configure)
+      # Continue below
+      ;;
+   abort-upgrade|abort-remove|abort-deconfigure)
+      exit 0;
+      ;;
+   *)
+      echo "postinst called with unknown argument \`$1'" >&2
+      exit 0;
+      ;;
+esac
+
+# so, we are running with $1 = configure
+# openmpi versions before 1.3.3-2 were using two alternatives where other
+# MPI implementations were using only one, which breaks. Clean up
+# our mess.
+if [ "$2" != "" ] && dpkg --compare-versions "$2" le "1.3.3-2"; then
+    update-alternatives --remove mpiexec /usr/bin/mpiexec.openmpi
+fi
 
 update-alternatives \
 	--install /usr/bin/mpirun mpirun /usr/bin/mpirun.openmpi 40 \

Modified: openmpi/trunk/debian/openmpi-bin.prerm
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.prerm?rev=211&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.prerm (original)
+++ openmpi/trunk/debian/openmpi-bin.prerm Mon Dec  7 22:47:52 2009
@@ -4,7 +4,6 @@
 
 if [ "$1" != "upgrade" ]; then
 	update-alternatives --remove mpirun /usr/bin/mpirun.openmpi
-	update-alternatives --remove mpiexec /usr/bin/mpiexec.openmpi
 fi
 
 #DEBHELPER#