[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5-14-gc94edf7

[Simon McVittie]

The following commit has been merged in the master branch:
commit 9ac0fa5a30420bc18ee4bee6e82afeb039c15678
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 15 21:00:57 2010 +0100

    Update q3arch.sh from ioquake3
    
    * Update q3arch.sh from ioquake3
      - don't warn when building on arm/armel
      - output the chosen architecture for the benefit of buildd logs

diff --git a/debian/changelog b/debian/changelog
index ff59e47..19e9f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openarena (0.8.5-6) UNRELEASED; urgency=low
   * Add support for arm/armel in q3arch.sh, avoiding a warning during build
     (the resulting binaries worked OK anyway though)
   * Improve the man pages a bit
+  * Update q3arch.sh from ioquake3
+    - don't warn when building on arm/armel
+    - output the chosen architecture for the benefit of buildd logs
 
  -- Simon McVittie <smcv at debian.org>  Mon, 11 Oct 2010 19:40:30 +0100
 
diff --git a/debian/q3arch.sh b/debian/q3arch.sh
index d864bad..c946361 100644
--- a/debian/q3arch.sh
+++ b/debian/q3arch.sh
@@ -33,31 +33,35 @@ arch)
     case ${DEB_X_GNU_CPU} in
 
     i?86)
-        echo i386
+        Q3ARCH=i386
         ;;
 
     powerpc)
-        echo ppc
+        Q3ARCH=ppc
         ;;
 
     powerpc64)
-        echo ppc64
+        Q3ARCH=ppc64
         ;;
 
     mipsel)
-        echo mips
+        Q3ARCH=mips
 	;;
 
     x86_64|s390|s390x|ia64|alpha|sparc|hppa|mips|arm)
-        echo ${DEB_X_GNU_CPU}
+        Q3ARCH=${DEB_X_GNU_CPU}
 	;;
 
     *)
         echo "CPU ${DEB_X_GNU_CPU} not supported by Quake 3, might not work" >&2
-        echo ${DEB_X_GNU_CPU}
+        Q3ARCH=${DEB_X_GNU_CPU}
         ;;
 
     esac
+
+    echo "DEB_$2_GNU_CPU = ${DEB_X_GNU_CPU}, using Q3 architecture ${Q3ARCH}">&2
+    echo ${Q3ARCH}
+
     ;;
 
 platform)
@@ -84,14 +88,18 @@ platform)
     case ${DEB_X_GNU_SYSTEM} in
 
     linux-gnu|linux-gnueabi)
-        echo linux
+        Q3OS=linux
         ;;
 
     *)
-        echo ${DEB_X_GNU_SYSTEM}
+        Q3OS=${DEB_X_GNU_SYSTEM}
         ;;
 
     esac
+
+    echo "DEB_$2_GNU_SYSTEM = ${DEB_X_GNU_SYSTEM}, using Q3 platform ${Q3OS}">&2
+    echo ${Q3OS}
+
     ;;
 
 *)

-- 
Packaging for the OpenArena engine