[scalapack] 26/29: Import Debian changes 1.8.0-12.2

[Muammar El Khatib]

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

muammar pushed a commit to branch master
in repository scalapack.

commit 51d8acf80e415546d5bfbe926c5b77df40bca37b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Feb 5 14:31:30 2016 +0000

    Import Debian changes 1.8.0-12.2
    
    scalapack (1.8.0-12.2) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Fix for openmpi1.10 transition: Use `pkg-config mpi-fort --libs`.
        Origian patch by Alastair McKinstry.  Closes: #813498
---
 debian/changelog                   | 10 +++++++++-
 debian/control                     |  2 +-
 debian/control.in                  |  2 +-
 debian/patches/01_SLmake.inc.patch |  4 ++--
 debian/rules                       |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1803f37..5020e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
+scalapack (1.8.0-12.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix for openmpi1.10 transition: Use `pkg-config mpi-fort --libs`.
+    Origian patch by Alastair McKinstry.  Closes: #813498
+
+ -- Mattia Rizzolo <mattia at debian.org>  Fri, 05 Feb 2016 14:31:30 +0000
+
 scalapack (1.8.0-12.1) unstable; urgency=medium
-  
+
   * Non-maintainer upload.
   [James Cowgill]
   * add mips64(el) into OPENMPI_ARCHES. (Closes: #775402)
diff --git a/debian/control b/debian/control
index 486b548..8775304 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Section: devel
 Priority: extra
 Maintainer: Muammar El Khatib <muammar at debian.org>
 Standards-Version: 3.8.4
-Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev
+Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev, pkg-config
 Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-openmpi1
diff --git a/debian/control.in b/debian/control.in
index 388022d..11e6619 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Muammar El Khatib <muammar at debian.org>
 Standards-Version: 3.8.4
-Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev
+Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev, pkg-config
 Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-openmpi1
diff --git a/debian/patches/01_SLmake.inc.patch b/debian/patches/01_SLmake.inc.patch
index 4010d5c..b1c5e18 100644
--- a/debian/patches/01_SLmake.inc.patch
+++ b/debian/patches/01_SLmake.inc.patch
@@ -9,12 +9,12 @@ Index: scalapack-1.8.0/SLmake.inc
 +ifeq ($(MPI),openmpi)
 +USEMPI        = -DUsingMpiBlacs
 +ifeq ($(BUILD),static)
-+SMPLIB        = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
++SMPLIB        = $(shell pkg-config mpi-fort --libs)
 +BLACSFINIT    = /usr/lib/libblacsF77init-openmpi.a
 +BLACSCINIT    = /usr/lib/libblacsCinit-openmpi.a
 +BLACSLIB      = /usr/lib/libblacs-openmpi.a
 +else
-+SMPLIB        = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
++SMPLIB        = $(shell pkg-config mpi-fort --libs)
 +BLACSFINIT    = -lblacsF77init-openmpi
 +BLACSCINIT    = -lblacsCinit-openmpi
 +BLACSLIB      = -lblacs-openmpi
diff --git a/debian/rules b/debian/rules
index bc1a967..452ad1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ build-stamp-openmpi:
 	  ar x ../$${i}_openmpi.a ;\
 	  cd .. ;\
 	  gcc -shared -Wl,-soname=lib$$i-openmpi.so.$(version_major) -o \
-	    lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-openmpi -lblacs-openmpi -L/usr/lib/openmpi/lib -lmpi -lmpi_f77 -lgfortran;\
+	    lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-openmpi -lblacs-openmpi $(shell pkg-config mpi-fort --libs) -lgfortran;\
 	  ln -snf lib$$i-openmpi.so.$(version) lib$$i-openmpi.so.$(version_major) ;\
 	  ln -snf lib$$i-openmpi.so.$(version_major) lib$$i-openmpi.so ;\
 	  rm tmp/* ;\

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