[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1802-1-5-g9cb5eef

[Simon McVittie]

The following commit has been merged in the master branch:
commit b77146a1e612c3fe440813a64d1f687192bfd5a1
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 16 23:21:13 2011 +0000

    Remove example scripts to run openarena: openarena in experimental now uses wrapper scripts around this engine, so please use that instead

diff --git a/debian/.gitignore b/debian/.gitignore
index b11e0a2..95ed957 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -3,5 +3,3 @@ files
 *.substvars
 ioquake3/
 ioquake3-server/
-wrappers/openarena
-wrappers/openarena-server
diff --git a/debian/changelog b/debian/changelog
index e23a5e4..cbfdb22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ioquake3 (1.36+svn1802-2) UNRELEASED; urgency=low
 
   * Correct patch 0014 so the variables are correctly formatted as strings
   * Update copyright file to DEP-5 (candidate) format
+  * Remove example scripts to run openarena: openarena in experimental now
+    uses wrapper scripts around this engine, so please use that instead
 
  -- Simon McVittie <smcv at debian.org>  Sun, 16 Jan 2011 23:02:09 +0000
 
diff --git a/debian/clean b/debian/clean
index eb2d096..378eac2 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1 @@
 build
-debian/wrappers/openarena
-debian/wrappers/openarena-server
diff --git a/debian/ioquake3-server.examples b/debian/ioquake3-server.examples
deleted file mode 100644
index c5409b0..0000000
--- a/debian/ioquake3-server.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/wrappers/openarena-server
diff --git a/debian/ioquake3.examples b/debian/ioquake3.examples
deleted file mode 100644
index 2b07c63..0000000
--- a/debian/ioquake3.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/wrappers/openarena
diff --git a/debian/rules b/debian/rules
index 81cc042..4182249 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,18 +52,6 @@ override_dh_auto_build:
 		$(TARGET)
 	install build/ioq3ded.* build/ioq3ded
 	install build/ioquake3.* build/ioquake3
-	sed -e s/@IOQ3BINARY@/ioquake3/ \
-		-e 's/@IOQ3SELF@/openarena/' \
-		-e 's/@IOQ3ROLE@/client/' \
-		< debian/wrappers/openarena.in \
-		> debian/wrappers/openarena
-	chmod +x debian/wrappers/openarena
-	sed -e s/@IOQ3BINARY@/ioq3ded/ \
-		-e 's/@IOQ3SELF@/openarena-server/' \
-		-e 's/@IOQ3ROLE@/server/' \
-		< debian/wrappers/openarena.in \
-		> debian/wrappers/openarena-server
-	chmod +x debian/wrappers/openarena-server
 
 # ---------------------------------------------------------------------------
 
diff --git a/debian/wrappers/openarena.in b/debian/wrappers/openarena.in
deleted file mode 100644
index 8dc7b78..0000000
--- a/debian/wrappers/openarena.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# quake3 or quake3-server or whatever
-IOQ3SELF=@IOQ3SELF@
-# "server" or "client"
-IOQ3ROLE=@IOQ3ROLE@
-# ioquake3 or ioq3ded
-IOQ3BINARY=@IOQ3BINARY@
-# q3a or openarena
-IOQ3DOTDIR=openarena
-
-ENGINE="/usr/lib/ioquake3/${IOQ3BINARY}"
-
-DEBUGGER="$OPENARENA_DEBUGGER"
-
-if test -n "$OPENARENA_BACKTRACE"; then
-  DEBUGGER="gdb -return-child-result -batch -ex run -ex 'thread apply all bt full' -ex kill -ex quit --args"
-fi
-
-# we're a standalone game
-CVARS="+set com_standalone 1"
-CVARS="$CVARS +set fs_basegame baseoa"
-CVARS="$CVARS +set fs_basepath /usr/lib/games/openarena"
-CVARS="$CVARS +set fs_homepath \"$HOME/.$IOQ3DOTDIR\""
-# OA uses a different protocol number to reflect incompatible game content
-CVARS="$CVARS +set protocol 71"
-# OA's default master server is different
-CVARS="$CVARS +set sv_master1 dpmaster.deathmask.net"
-# update.quake3arena.com is pretty irrelevant if you're playing OA
-CVARS="$CVARS +set cl_motd 0"
-
-QUIET=0
-
-EXCUSE="\
-OpenArena ${IOQ3ROLE} wrapper for Debian\n\
-\n\
-Usage: ${IOQ3SELF} [OPTION]...\n\
-\n\
- -h, --help\t\tDisplay this help\n\
- -q, --quiet\t\tDisable console output\n\
-  +<internal command>\tPass commands to the engine\n"
-
-while [ "$1" != "" ]; do
-  case "$1" in
-    -h|--help)
-      echo ${EXCUSE}
-      exit 0
-      ;;
-    -q|--quiet)
-      CVARS="$CVARS +set ttycon 0"
-      QUIET=1
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
-
-if test "z$QUIET" = z1; then
-  exec >/dev/null 2>&1;
-fi
-
-exec ${DEBUGGER} ${ENGINE} ${CVARS} "$@"

-- 
Quake 3 engine