[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp2-2-g58f7a9b

[Simon McVittie]

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

    Deal with OPENARENA_BACKTRACE correctly
    
    The way OPENARENA_DEBUGGER works doesn't support arguments containing
    spaces.

diff --git a/debian/changelog b/debian/changelog
index 7277833..3a52282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openarena (0.8.5-5+exp3) UNRELEASED; urgency=low
+
+  * Make the OPENARENA_BACKTRACE option work correctly
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 15 Jan 2011 15:58:17 +0000
+
 openarena (0.8.5-5+exp2) experimental; urgency=low
 
   * Create a Debian-openarena user and install an init script (off by default)
diff --git a/debian/scripts/openarena.in b/debian/scripts/openarena.in
index 8dc7b78..c12c792 100644
--- a/debian/scripts/openarena.in
+++ b/debian/scripts/openarena.in
@@ -13,10 +13,6 @@ 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"
@@ -61,4 +57,8 @@ if test "z$QUIET" = z1; then
   exec >/dev/null 2>&1;
 fi
 
-exec ${DEBUGGER} ${ENGINE} ${CVARS} "$@"
+if test -n "$OPENARENA_BACKTRACE"; then
+  exec gdb -return-child-result -batch -ex run -ex 'thread apply all bt full' -ex kill -ex quit --args ${ENGINE} ${CVARS} "$@"
+else
+  exec ${DEBUGGER} ${ENGINE} ${CVARS} "$@"
+fi

-- 
Packaging for the OpenArena engine