[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

[Simon McVittie]

The following commit has been merged in the master branch:
commit 2f3d9286c9676b579052e1b483f6841bb64595ca
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 04:19:13 2010 +0100

    q3arch.sh: be more pedantic about the listed architectures
    
    q_platform.h defines an ARCH_STRING based on predefined cpp macros; if it
    can't identify the architecture based on those, compilation fails.
    
    Worse, if the ARCH doesn't match the ARCH_STRING, the engine will compile,
    but look for its shared objects in the wrong place, and fail to work.

diff --git a/debian/q3arch.sh b/debian/q3arch.sh
index a36813c..9b67c46 100644
--- a/debian/q3arch.sh
+++ b/debian/q3arch.sh
@@ -20,9 +20,13 @@ arch)
     # it's just "some other architecture", so we can get away with using the
     # GNU CPU as-is. i386, ppc and x86_64 are the unusual ones.
     #
-    # (For instance, on Debian's HPPA buildd, uname -m says parisc64 whereas
-    # the GNU CPU type is hppa, but that's not important because the Makefile
-    # doesn't actually do anything different.)
+    # On the other hand, in q_platform.h it all becomes rather more
+    # significant: the engine expects to see one of:
+    #
+    # x86, AXP, x86_64 (Windows)
+    # i386, ppc (Mac OS)
+    # i386, x86_64, ppc64, ppc, s390, s390x, ia64, alpha, sparc, arm, cris,
+    #    hppa, mips, sh (Linux)
 
     DEB_X_GNU_CPU=`dpkg-architecture -qDEB_$2_GNU_CPU`
 
@@ -36,7 +40,20 @@ arch)
         echo ppc
         ;;
 
+    powerpc64)
+        echo ppc64
+        ;;
+
+    mipsel)
+        echo mips
+	;;
+
+    x86_64|s390|s390x|ia64|alpha|sparc|hppa|mips)
+        echo ${DEB_X_GNU_CPU}
+	;;
+
     *)
+        echo "CPU ${DEB_X_GNU_CPU} not supported by Quake 3, might not work" >&2
         echo ${DEB_X_GNU_CPU}
         ;;
 
@@ -84,7 +101,7 @@ platform)
 
 esac
 
-# Copyright 2009 Simon McVittie <smcv at debian.org>
+# Copyright 2009-2010 Simon McVittie <smcv at debian.org>
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided this notice is preserved.
 # This file is offered as-is, without any warranty.

-- 
Packaging for the OpenArena engine