[atlas] 02/02: Use the new GENERIC arch name for powerpc, instead of POWER3.

[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 acdc418ed9a8ca094b30aa6af8205c3523f3412f
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Feb 3 18:34:33 2014 +0100

    Use the new GENERIC arch name for powerpc, instead of POWER3.
    
    Hopefully that will fix the FTBFS on powerpc.
    
    Git-Dch: Full
---
 debian/archdefs/powerpc/GENERIC32.tar.bz2 | Bin 0 -> 8699 bytes
 debian/archdefs/powerpc/POWER332.tar.bz2  | Bin 8686 -> 0 bytes
 debian/rules                              |   3 ---
 debian/source/include-binaries            |   2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/archdefs/powerpc/GENERIC32.tar.bz2 b/debian/archdefs/powerpc/GENERIC32.tar.bz2
new file mode 100644
index 0000000..dd53459
Binary files /dev/null and b/debian/archdefs/powerpc/GENERIC32.tar.bz2 differ
diff --git a/debian/archdefs/powerpc/POWER332.tar.bz2 b/debian/archdefs/powerpc/POWER332.tar.bz2
deleted file mode 100644
index 6505f42..0000000
Binary files a/debian/archdefs/powerpc/POWER332.tar.bz2 and /dev/null differ
diff --git a/debian/rules b/debian/rules
index 5cf2305..5333c9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ 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 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
 # - 13 means generic libraries for P4 and later, with SSE2: for *amd64
@@ -34,8 +33,6 @@ else ifeq ($(DEB_HOST_ARCH),sparc)
 ARCHS=base_38_1
 else ifeq ($(DEB_HOST_ARCH),armhf)
 ARCHS=base_46_1
-else ifneq (,$(findstring $(DEB_HOST_ARCH),powerpc ppc64))
-ARCHS=base_1_1
 else
 ARCHS=base_47_1
 endif
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 994421b..8213eb4 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -6,6 +6,6 @@ debian/archdefs/i386/x86x8732.tar.bz2
 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/powerpc/GENERIC32.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