[adios] 07/13: Fix for openmpi1.10 transition

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.9.0-8
in repository adios.

commit f6711344c442904b48aa796e595172ad73aff614
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 1 19:44:33 2016 +0000

    Fix for openmpi1.10 transition
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59964d5..a11e15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.9.0-7) UNRELEASED; urgency=medium
+
+  * Fix for openmpi1.10 transition
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 01 Feb 2016 19:44:05 +0000
+
 adios (1.9.0-6) unstable; urgency=medium
 
   * Don't include '-lcr' on x32, 68k either.
diff --git a/debian/control b/debian/control
index 33328df..63517d6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), 
   libnetcdf-dev, 
   gfortran, libmxml-dev, 
-  mpi-default-dev,
+  mpi-default-dev, pkg-config,
   autotools-dev, cmake, libbz2-dev, zlib1g-dev, dh-autoreconf,
   libibverbs-dev [ !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
   python-dev, python-numpy, python-mpi4py, cython, dh-python,
   python3-all-dev, python3-numpy, python3-mpi4py, cython3,
   libglib2.0-dev, libhdf5-serial-dev, libhdf5-mpi-dev
 Build-Conflicts: libadios-dev, libadios-bin
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
 Vcs-git: git://anonscm.debian.org/debian-science/packages/adios.git
 X-Python-Version: 2.7
diff --git a/debian/rules b/debian/rules
index 0359727..0ab6039 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ endif
 endif
 
 ifeq ($(MPI), openmpi)
-MPI_LIBS:= -L/usr/lib/openmpi/lib -L/usr//lib -lmpi_f90 -lmpi_f77 -lmpi 
+MPI_LIBS:= $$(pkg-config mpi-fort --libs)
 endif
 ifeq ($(ARCH),s390x)
 MPI_LIBS:= -Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread

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