[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-9-4-ga0cbd3d

[Simon McVittie]

The following commit has been merged in the master branch:
commit 68a9fc534171616bad8631bad856e8860e28476d
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Aug 4 09:08:19 2011 +0100

    Add support for recent ioquake3
    
    * Set protocol for ioquake3 >= r2075, as well as for older versions
    * Use Quake3Arena as our game name, so IPv6 queries to master servers
      might actually work

diff --git a/debian/changelog b/debian/changelog
index 6d2a0b0..33769fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ openarena (0.8.5-10) UNRELEASED; urgency=low
   * As the package uses debhelper (>= 8) the parallel=N stuff can be removed
     from debian/rules
 
+  [ Simon McVittie ]
+  * Set protocol for ioquake3 >= r2075, as well as for older versions
+  * Use Quake3Arena as our game name, so IPv6 queries to master servers
+    might actually work
+
  -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Fri, 25 Mar 2011 18:15:00 +0100
 
 openarena (0.8.5-9) unstable; urgency=low
diff --git a/debian/scripts/openarena.in b/debian/scripts/openarena.in
index cff9a30..b44a6c8 100644
--- a/debian/scripts/openarena.in
+++ b/debian/scripts/openarena.in
@@ -13,20 +13,30 @@ DEBUGGER="$OPENARENA_DEBUGGER"
 
 # we're a standalone game
 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 .openarena"
 
-# 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"
-
-# OA uses a different protocol number to reflect incompatible game content
+# OA uses a different protocol number to reflect incompatible game content.
+# When it says "71", that's actually the legacy Quake III Arena 1.32c protocol,
+# protocol 68.
+CVARS="$CVARS +set com_legacyprotocol 71"
+# ioquake3 < r2075 only implemented the legacy protocol, called "protocol".
 CVARS="$CVARS +set protocol 71"
+# For the moment, disable the modern protocol, by setting this cvar to the
+# same thing. When OA upstream decide what value they'll use, we should
+# catch up.
+CVARS="$CVARS +set com_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"
+# OA 0.8.5 sends QuakeArena-1 heartbeats, which dpmaster interprets as implying
+# that it's a version of Quake III Arena from the future rather than a separate
+# game. Remain compatible even in ioquake3 >= r2105, by leaving com_gamename
+# set to the default, "Quake3Arena"; this will hopefully be fixed in a future
+# OA version, but that's a compatibility break.
+#CVARS="$CVARS +set com_gamename Quake3Arena"
 
 QUIET=0
 

-- 
Packaging for the OpenArena engine