[atlas] 01/02: Remove architectural defaults for obsolete s390 arch.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository atlas.

commit 730e93d624f0663823bf6bd5af7bbb6e93fb82d6
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Feb 3 18:06:02 2014 +0100

    Remove architectural defaults for obsolete s390 arch.
---
 debian/archdefs/README               |   1 -
 debian/archdefs/s390/IBMz932.tar.bz2 | Bin 7754 -> 0 bytes
 debian/rules                         |   4 ++--
 debian/source/include-binaries       |   1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/archdefs/README b/debian/archdefs/README
index 30d394e..5b597cb 100644
--- a/debian/archdefs/README
+++ b/debian/archdefs/README
@@ -17,6 +17,5 @@ generated (other details are in README.source):
 - mips: ATLAS 3.10.1 / gabrielli.debian.org / sid / 2013-07-27
 - mipsel: ATLAS 3.10.1 / eder.debian.org / sid / 2013-06-07
 - powerpc: ATLAS 3.10.1 / partch.debian.org / sid / 2013-06-06
-- s390: ATLAS 3.10.1 / zelenka.debian.org / sid / 2013-06-06
 - s390x: ATLAS 3.10.1 / zelenka.debian.org / sid / 2013-06-06
 - sparc: ATLAS 3.10.1 / smetana.debian.org / wheezy / 2013-06-06
diff --git a/debian/archdefs/s390/IBMz932.tar.bz2 b/debian/archdefs/s390/IBMz932.tar.bz2
deleted file mode 100644
index 7863bd4..0000000
Binary files a/debian/archdefs/s390/IBMz932.tar.bz2 and /dev/null differ
diff --git a/debian/rules b/debian/rules
index bd35c35..5cf2305 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 #
 # First number in ARCHS:
 # - 0 means Unknown CPU: leave ATLAS find out; used for archs where a more specific choice is not available
-# - 8 means IBMz9: for s390 and s390x
+# - 8 means IBMz9: for s390x
 # - 1 means POWER3: most generic PowerPC (#680096); cannot be used on powerpcspe (#701068)
 # - 11 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults: for *i386
 #   See http://math-atlas.sourceforge.net/atlas_install/node28.html
@@ -22,7 +22,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 # Second number in ARCHS:
 # - 1 means no instruction set extension
 # - 384 means SSE1+SSE2 (always available on amd64)
-ifneq (,$(findstring $(DEB_HOST_ARCH),s390 s390x))
+ifeq ($(DEB_HOST_ARCH),s390x)
 ARCHS=base_8_1
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
 ARCHS=base_11_1
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 9ad79fb..994421b 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -7,6 +7,5 @@ debian/archdefs/ia64/IA64Itan64.tar.bz2
 debian/archdefs/mips/GENERIC32.tar.bz2
 debian/archdefs/mipsel/GENERIC32.tar.bz2
 debian/archdefs/powerpc/POWER332.tar.bz2
-debian/archdefs/s390/IBMz932.tar.bz2
 debian/archdefs/s390x/IBMz964.tar.bz2
 debian/archdefs/sparc/USI32.tar.bz2

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