On Fri, Feb 05, 2016 at 02:16:42PM +0000, Mattia Rizzolo wrote: > I've prepared an NMU for scalapack (versioned as 1.8.0-12.2) and > uploaded it to DELAYED/2. Please feel free to tell me if I > should delay it longer.
I've run nmudiff in the wrong directory, attached there is what I
actually uploaded.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for scalapack-1.8.0 scalapack-1.8.0 changelog | 10 +++++++++- control | 2 +- control.in | 2 +- patches/01_SLmake.inc.patch | 4 ++-- rules | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff -Nru scalapack-1.8.0/debian/changelog scalapack-1.8.0/debian/changelog --- scalapack-1.8.0/debian/changelog 2015-03-10 09:10:28.000000000 +0000 +++ scalapack-1.8.0/debian/changelog 2016-02-05 14:31:33.000000000 +0000 @@ -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 <mat...@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 -Nru scalapack-1.8.0/debian/control scalapack-1.8.0/debian/control --- scalapack-1.8.0/debian/control 2015-03-10 09:20:10.000000000 +0000 +++ scalapack-1.8.0/debian/control 2016-02-05 14:31:35.000000000 +0000 @@ -8,7 +8,7 @@ Priority: extra Maintainer: Muammar El Khatib <muam...@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 -Nru scalapack-1.8.0/debian/control.in scalapack-1.8.0/debian/control.in --- scalapack-1.8.0/debian/control.in 2014-04-23 12:37:11.000000000 +0000 +++ scalapack-1.8.0/debian/control.in 2016-02-05 14:26:30.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Muammar El Khatib <muam...@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 -Nru scalapack-1.8.0/debian/patches/01_SLmake.inc.patch scalapack-1.8.0/debian/patches/01_SLmake.inc.patch --- scalapack-1.8.0/debian/patches/01_SLmake.inc.patch 2011-12-25 18:56:52.000000000 +0000 +++ scalapack-1.8.0/debian/patches/01_SLmake.inc.patch 2016-02-05 14:30:48.000000000 +0000 @@ -9,12 +9,12 @@ +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 -Nru scalapack-1.8.0/debian/rules scalapack-1.8.0/debian/rules --- scalapack-1.8.0/debian/rules 2015-03-10 09:08:06.000000000 +0000 +++ scalapack-1.8.0/debian/rules 2016-02-05 14:31:00.000000000 +0000 @@ -49,7 +49,7 @@ 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/* ;\
signature.asc
Description: PGP signature
