[mpi-defaults] 01/01: * Team upload * Cope with multi-arch openmpi. Closes: #848797 * Add myself to Uploaders.

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository mpi-defaults.

commit 9e2886bdb8b172d71b3b1169f742527127b70b62
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 26 09:16:22 2016 +0000

    * Team upload
    * Cope with multi-arch openmpi.  Closes: #848797
    * Add myself to Uploaders.
---
 debian/changelog  | 8 ++++++++
 debian/control    | 3 ++-
 debian/control.in | 3 ++-
 debian/rules      | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e574e71..06f455a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mpi-defaults (1.8) unstable; urgency=medium
+
+  * Team upload
+  * Cope with multi-arch openmpi.  Closes: #848797
+  * Add myself to Uploaders.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 26 Dec 2016 09:08:47 +0000
+
 mpi-defaults (1.7) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 666362c..cab5e30 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Source: mpi-defaults
 Section: devel
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Manuel Prinz <manuel at debian.org>
+Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Manuel Prinz <manuel at debian.org>,
+ Alastair McKinstry <mckinstry at debian.org>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9),
  libopenmpi-dev (>= 1.4.3-2.1) [alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32],
diff --git a/debian/control.in b/debian/control.in
index c8f29cb..380edc6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,8 @@ Source: mpi-defaults
 Section: devel
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Manuel Prinz <manuel at debian.org>
+Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Manuel Prinz <manuel at debian.org>,
+ Alastair McKinstry <mckinstry at debian.org>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9),
  libopenmpi-dev (>= 1.4.3-2.1) [%OPENMPI_ARCHITECTURES%],
diff --git a/debian/rules b/debian/rules
index fac0fbe..e8ea844 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DH_VERBOSE=1
 d := debian/debian_defaults
 
 # default in this architecture:
-MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
+MPI=$(shell readlink /etc/alternatives/mpicc | sed s/usr//g | sed s/bin//g | sed s/mpicc.//g | sed s/\\///g)
 
 # availability of MPI implementations:
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpi-defaults.git