[scalapack] 28/29: Import Debian changes 1.8.0-13

[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 148e57926a86dd473a1c169b8fcfcc40c537cdcb
Author: Muammar El Khatib <muammar at debian.org>
Date:   Mon Sep 5 23:48:13 2016 +0200

    Import Debian changes 1.8.0-13
    
    scalapack (1.8.0-13) unstable; urgency=medium
    
      * Added missing build-{arch,indep} targets. Thanks to Santiago Vila for
        providing a patch. Closes: #822021.
      * hppa architecture switched to openmpi. Closes: #834182.
---
 debian/changelog |  8 ++++++++
 debian/control   |  8 ++++----
 debian/rules     | 10 +++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef58307..e56f7b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scalapack (1.8.0-13) unstable; urgency=medium
+
+  * Added missing build-{arch,indep} targets. Thanks to Santiago Vila for
+    providing a patch. Closes: #822021.
+  * hppa architecture switched to openmpi. Closes: #834182.
+
+ -- Muammar El Khatib <muammar at debian.org>  Mon, 05 Sep 2016 23:48:13 +0200
+
 scalapack (1.8.0-12.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 2633f3d..c9a3fe8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Homepage: http://www.netlib.org/scalapack/
 
 Package: libscalapack-openmpi1
 Section: libs
-Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa
 Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack1-mpich, scalapack1-lam
 Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -31,7 +31,7 @@ Description: Scalable Linear Algebra Package - Shared libs. for OpenMPI
 
 Package: libscalapack-mpich1
 Section: libs
-Architecture: hppa m68k sh4
+Architecture: m68k sh4
 Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack1-mpich, scalapack1-lam
 Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -50,8 +50,8 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPICH
 Package: libscalapack-mpi-dev
 Section: libdevel
 Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa m68k sh4
-Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64],
-         libscalapack-mpich1 (= ${binary:Version}) [hppa m68k sh4],
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa],
+         libscalapack-mpich1 (= ${binary:Version}) [m68k sh4],
          libblacs-mpi-dev, ${misc:Depends}
 Conflicts: scalapack-mpich-dev, scalapack-lam-dev
 Replaces: scalapack-mpich-dev, scalapack-lam-dev
diff --git a/debian/rules b/debian/rules
index e3040b9..7663ac9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,12 @@ SCALAPACK_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 # This list of archs is maintained separately from that of the mpi-defaults
 # package. If there is a mismatch between the two, the package will FTBFS. This
 # is on purpose, to avoid silent breakage. See #740620 for more details.
-OPENMPI_ARCHS=alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64
-MPICH_ARCHS=hppa m68k sh4
+OPENMPI_ARCHS=alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa
+MPICH_ARCHS=m68k sh4
+
+build-arch: build
+
+build-indep: build
 
 build: build-$(SCALAPACK_MPI) build-pvm
 
@@ -496,4 +500,4 @@ source diff:
 
 binary: binary-arch binary-indep
 
-.PHONY: binary binary-indep binary-arch clean build
+.PHONY: binary binary-indep binary-arch clean build build-arch build-indep

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