[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 9b39831df7b40ce2e93723bc6de8bb01ba879a69
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 5 21:14:36 2011 +0000

    Drop compatibility with older (patched) ioquake3

diff --git a/debian/changelog b/debian/changelog
index cd8ac17..bc6e607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 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)
+  * Use com_basegame, com_homepath etc. from recent upstream ioquake3
+    - depend on a suitably new snapshot
   * Add an openarena-dbg package
   * Don't strcpy a buffer into itself, squashing a valgrind warning
   * Declare CG_FairCvars properly, squashing a compiler warning
diff --git a/debian/control b/debian/control
index b4c2760..f457c1f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Simon McVittie <smcv at debian.org>
 Build-Depends: debhelper (>= 8),
                imagemagick,
-               ioquake3-server (>= 1.36+svn1802-1~),
+               ioquake3-server (>= 1.36+svn1858),
                libcurl4-gnutls-dev,
                libjpeg62-dev,
                libopenal-dev,
diff --git a/debian/scripts/openarena.in b/debian/scripts/openarena.in
index d7a0cab..1abbadc 100644
--- a/debian/scripts/openarena.in
+++ b/debian/scripts/openarena.in
@@ -23,12 +23,6 @@ CVARS="$CVARS +set com_homepath $IOQ3DOTDIR"
 #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