[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp1-4-g315c454

Thu Nov 11 22:48:41 UTC 2010

The following commit has been merged in the master branch:
commit 7dab941b2b190b98b282bbe8b3d3157ac6aca586
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 11 22:30:57 2010 +0000

    Depend on an ioquake3-server new enough to have q3arch.sh, and use it

diff --git a/debian/changelog b/debian/changelog
index a04525f..7625af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openarena (0.8.5-5+exp2) UNRELEASED; urgency=low
   * Create a Debian-openarena user and install an init script (off by default)
     (Closes: #503106)
   * Add a README.Debian explaining alternative ways to run the server
+  * Depend on an ioquake3-server new enough to have q3arch.sh, and use it
 
  -- Simon McVittie <smcv at debian.org>  Thu, 11 Nov 2010 20:13:30 +0000
 
diff --git a/debian/control b/debian/control
index 19d4e8b..ee85b7c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,15 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Gonéri Le Bouder <goneri at rulezlan.org>,
            Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, libvorbis-dev, libjpeg62-dev, libspeexdsp-dev
+Build-Depends: debhelper (>= 7.0.50~),
+               libsdl1.2-dev,
+               libopenal-dev,
+               imagemagick,
+               ioquake3-server (>= 1.36+svn1802-1~),
+               libcurl4-gnutls-dev,
+               libvorbis-dev,
+               libjpeg62-dev,
+               libspeexdsp-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-games/openarena.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/openarena.git;a=summary
diff --git a/debian/q3arch.sh b/debian/q3arch.sh
deleted file mode 100644
index c946361..0000000
--- a/debian/q3arch.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-# Usage: q3arch.sh arch|platform BUILD|HOST
-#
-# Output an architecture or platform name that Quake 3 could use for the
-# build or host CPU architecture or operating system.
-
-set -e
-
-case $1 in
-
-arch)
-    # In the upstream Makefile the architecture is given by uname -m, with the
-    # following substitutions:
-    #
-    # i.86 -> i386
-    # powerpc -> ppc
-    # alpha -> axp (on Linux and FreeBSD)
-    #
-    # However, for most architectures the build system doesn't actually care,
-    # 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.
-    #
-    # 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`
-
-    case ${DEB_X_GNU_CPU} in
-
-    i?86)
-        Q3ARCH=i386
-        ;;
-
-    powerpc)
-        Q3ARCH=ppc
-        ;;
-
-    powerpc64)
-        Q3ARCH=ppc64
-        ;;
-
-    mipsel)
-        Q3ARCH=mips
-	;;
-
-    x86_64|s390|s390x|ia64|alpha|sparc|hppa|mips|arm)
-        Q3ARCH=${DEB_X_GNU_CPU}
-	;;
-
-    *)
-        echo "CPU ${DEB_X_GNU_CPU} not supported by Quake 3, might not work" >&2
-        Q3ARCH=${DEB_X_GNU_CPU}
-        ;;
-
-    esac
-
-    echo "DEB_$2_GNU_CPU = ${DEB_X_GNU_CPU}, using Q3 architecture ${Q3ARCH}">&2
-    echo ${Q3ARCH}
-
-    ;;
-
-platform)
-    # In the upstream Makefile the platform is given by uname, with the
-    # following substitutions:
-    #
-    # anything after _ removed
-    # folded to lower case
-    # / -> _
-    #
-    # This would result in Debian builds being done for linux, gnu_kfreebsd and
-    # gnu.
-    #
-    # However, for most platform names the build system doesn't actually care,
-    # it's just "some other platform", so we can get away with using the
-    # GNU system as-is.
-    #
-    # (For instance, on Debian kFreeBSD buildd, uname says GNU/kFreeBSD whereas
-    # the GNU CPU type is kfreebsd-gnu, but that's not important because the
-    # Makefile doesn't actually do anything different.)
-
-    DEB_X_GNU_SYSTEM=`dpkg-architecture -qDEB_$2_GNU_SYSTEM`
-
-    case ${DEB_X_GNU_SYSTEM} in
-
-    linux-gnu|linux-gnueabi)
-        Q3OS=linux
-        ;;
-
-    *)
-        Q3OS=${DEB_X_GNU_SYSTEM}
-        ;;
-
-    esac
-
-    echo "DEB_$2_GNU_SYSTEM = ${DEB_X_GNU_SYSTEM}, using Q3 platform ${Q3OS}">&2
-    echo ${Q3OS}
-
-    ;;
-
-*)
-    echo "Usage: sh q3arch.sh arch|platform BUILD|HOST" >&2
-    exit 1
-    ;;
-
-esac
-
-# 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.
diff --git a/debian/rules b/debian/rules
index bb5ad7c..4a6dd1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,10 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-Q3ARCH             := $(shell sh $(CURDIR)/debian/q3arch.sh arch     HOST)
-Q3PLATFORM         := $(shell sh $(CURDIR)/debian/q3arch.sh platform HOST)
-Q3COMPILE_ARCH     := $(shell sh $(CURDIR)/debian/q3arch.sh arch     BUILD)
-Q3COMPILE_PLATFORM := $(shell sh $(CURDIR)/debian/q3arch.sh platform BUILD)
+Q3ARCH             := $(shell /usr/share/ioquake3/q3arch.sh arch     HOST)
+Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch.sh platform HOST)
+Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch.sh arch     BUILD)
+Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch.sh platform BUILD)
 
 CFLAGS += -fsigned-char
 

-- 
Packaging for the OpenArena engine

