[scalapack] 24/29: Import Debian changes 1.8.0-12

[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 2bf89d1fac6a2324ec74d23b01d9eaccf68fbcd6
Author: Muammar El Khatib <muammar at debian.org>
Date:   Wed Oct 22 20:45:57 2014 +0200

    Import Debian changes 1.8.0-12
    
    scalapack (1.8.0-12) unstable; urgency=medium
    
      * Correcting previous bug with this new upload. arm64 has been changed to
        OPENMPI_ARCHS in debian/rules.
---
 debian/changelog |  7 +++++++
 debian/control   | 12 ++++++------
 debian/rules     |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2b9db1..01f4cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scalapack (1.8.0-12) unstable; urgency=medium
+
+  * Correcting previous bug with this new upload. arm64 has been changed to
+    OPENMPI_ARCHS in debian/rules.
+
+ -- Muammar El Khatib <muammar at debian.org>  Wed, 22 Oct 2014 20:45:57 +0200
+
 scalapack (1.8.0-11) unstable; urgency=medium
 
   * "arm64" has been moved from MPICH_ARCHS to OPENMPI_ARCHS in debian/rules.
diff --git a/debian/control b/debian/control
index e4d482a..a756d6f 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 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
 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: arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: hppa m68k powerpcspe ppc64 s390x sparc64
 Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack1-mpich, scalapack1-lam
 Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -49,9 +49,9 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPICH
 
 Package: libscalapack-mpi-dev
 Section: libdevel
-Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
-Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc],
-         libscalapack-mpich1 (= ${binary:Version}) [arm64 hppa m68k powerpcspe ppc64 s390x sparc64],
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc hppa m68k powerpcspe ppc64 s390x sparc64
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc],
+         libscalapack-mpich1 (= ${binary:Version}) [hppa m68k powerpcspe ppc64 s390x sparc64],
          libblacs-mpi-dev, ${misc:Depends}
 Conflicts: scalapack-mpich-dev, scalapack-lam-dev
 Replaces: scalapack-mpich-dev, scalapack-lam-dev
@@ -71,7 +71,7 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
 
 Package: scalapack-mpi-test
 Section: math
-Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc hppa m68k powerpcspe ppc64 s390x sparc64
 Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: scalapack-mpich-test, scalapack-lam-test
 Replaces: scalapack-mpich-test, scalapack-lam-test
diff --git a/debian/rules b/debian/rules
index f90d458..b14a94e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@ 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 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
-MPICH_ARCHS=arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+OPENMPI_ARCHS=alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
+MPICH_ARCHS=hppa m68k powerpcspe ppc64 s390x sparc64
 
 build: build-$(SCALAPACK_MPI) build-pvm
 

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