[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-5+exp3-6-g244dd8c

[Simon McVittie]

The following commit has been merged in the master branch:
commit a38a693487d9e170b21e21fa75be0e4ae2732ce6
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 5 17:51:01 2011 +0000

    Use com_basegame, com_homepath etc. from recent upstream ioquake3 (still compatible with older versions for now)

diff --git a/debian/changelog b/debian/changelog
index db59284..c71e50f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openarena (0.8.5-6) UNRELEASED; urgency=low
+
+  * Use com_basegame, com_homepath etc. from recent upstream ioquake3 (still
+    compatible with older versions for now)
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 22:11:01 +0000
+
 openarena (0.8.5-5+exp3) experimental; urgency=low
 
   * Make the OPENARENA_BACKTRACE option work correctly
diff --git a/debian/scripts/openarena.in b/debian/scripts/openarena.in
index c12c792..d7a0cab 100644
--- a/debian/scripts/openarena.in
+++ b/debian/scripts/openarena.in
@@ -14,10 +14,21 @@ ENGINE="/usr/lib/ioquake3/${IOQ3BINARY}"
 DEBUGGER="$OPENARENA_DEBUGGER"
 
 # we're a standalone game
-CVARS="+set com_standalone 1"
-CVARS="$CVARS +set fs_basegame baseoa"
+CVARS="+set com_basegame baseoa"
+CVARS="$CVARS +set cl_gamename openarena"
 CVARS="$CVARS +set fs_basepath /usr/lib/games/openarena"
+CVARS="$CVARS +set com_homepath $IOQ3DOTDIR"
+
+# OA 0.8.5 uses the Quake 3 defaults even though they're not really appropriate
+#CVARS="$CVARS +set sv_heartbeat QuakeArena-1"
+#CVARS="$CVARS +set sv_flatline QuakeArena-1"
+
+# backwards-compatible with earlier Debian patches to ioquake3; these
+# are no longer needed from r1858 onwards
+CVARS="$CVARS +set com_standalone 1"
+CVARS="$CVARS +set fs_basegame baseoa"
 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

-- 
Packaging for the OpenArena engine