[SCM] [contrib] Quake III: Arena launcher branch, master, updated. debian/1.1-2-g2606041

[Simon McVittie]

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

    Make the QUAKE3_BACKTRACE option work properly
    
    The way QUAKE3_DEBUGGER works doesn't support arguments containing spaces.

diff --git a/debian/changelog b/debian/changelog
index 1a925f1..a4ce73d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quake3 (1.2) UNRELEASED; urgency=low
+
+  * Make the QUAKE3_BACKTRACE option work properly
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 16 Jan 2011 22:23:32 +0000
+
 quake3 (1.1) experimental; urgency=low
 
   * Allow game-data-packager to satisfy the quake3-data dependency
diff --git a/quake3.in b/quake3.in
index 7912e8c..d13ba98 100644
--- a/quake3.in
+++ b/quake3.in
@@ -14,10 +14,6 @@ ENGINE="/usr/lib/ioquake3/${IOQ3BINARY}"
 
 DEBUGGER="$QUAKE3_DEBUGGER"
 
-if test -n "$QUAKE3_BACKTRACE"; then
-  DEBUGGER="gdb -return-child-result -batch -ex run -ex 'thread apply all bt full' -ex kill -ex quit --args"
-fi
-
 # the defaults mostly apply
 CVARS="+set com_standalone 0"
 CVARS="$CVARS +set fs_basepath $BASEPATH"
@@ -68,4 +64,8 @@ if test "z$QUIET" = z1; then
   exec >/dev/null 2>&1;
 fi
 
-exec ${DEBUGGER} ${ENGINE} ${CVARS} "$@"
+if test -n "$QUAKE3_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

-- 
[contrib] Quake III: Arena launcher