[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 68083f3cf59db9226c5af430ea20ee59fa092e3a
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 5 20:25:00 2011 +0000

    Declare CG_FairCvars properly, squashing a compiler warning

diff --git a/debian/changelog b/debian/changelog
index 3888249..cd8ac17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openarena (0.8.5-6) UNRELEASED; urgency=low
     compatible with older versions for now)
   * Add an openarena-dbg package
   * Don't strcpy a buffer into itself, squashing a valgrind warning
+  * Declare CG_FairCvars properly, squashing a compiler warning
 
  -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 22:11:01 +0000
 
diff --git a/debian/patches/0002-CG_FairCvars-declare-as-void-not-as-having-unspecifi.patch b/debian/patches/0002-CG_FairCvars-declare-as-void-not-as-having-unspecifi.patch
new file mode 100644
index 0000000..0ed34f8
--- /dev/null
+++ b/debian/patches/0002-CG_FairCvars-declare-as-void-not-as-having-unspecifi.patch
@@ -0,0 +1,35 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sat, 5 Feb 2011 17:38:21 +0000
+Subject: [PATCH] CG_FairCvars: declare as void, not as having unspecified arguments
+
+---
+ game/code/cgame/cg_local.h |    2 +-
+ game/code/cgame/cg_main.c  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/game/code/cgame/cg_local.h b/game/code/cgame/cg_local.h
+index a25027b..ac03860 100644
+--- a/game/code/cgame/cg_local.h
++++ b/game/code/cgame/cg_local.h
+@@ -1378,7 +1378,7 @@ void CG_BuildSpectatorString( void );
+ //unlagged, sagos modfication
+ void SnapVectorTowards( vec3_t v, vec3_t to );
+ 
+-void CG_FairCvars();
++void CG_FairCvars(void);
+ 
+ //
+ // cg_view.c
+diff --git a/game/code/cgame/cg_main.c b/game/code/cgame/cg_main.c
+index 5525e47..ec462ab 100644
+--- a/game/code/cgame/cg_main.c
++++ b/game/code/cgame/cg_main.c
+@@ -2229,7 +2229,7 @@ void SnapVectorTowards( vec3_t v, vec3_t to ) {
+ 
+ static qboolean do_vid_restart = qfalse;
+ 
+-void CG_FairCvars() {
++void CG_FairCvars(void) {
+     qboolean vid_restart_required = qfalse;
+     char rendererinfos[128];
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5102672..e60cf63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0001-EasyClientName-don-t-strcpy-a-buffer-into-itself.patch
+0002-CG_FairCvars-declare-as-void-not-as-having-unspecifi.patch
 0031-Fix-FTBFS-on-kFreeBSD.patch
 0036-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
 0039-Used-self-enemy-before-it-was-initialized.-Might-hav.patch

-- 
Packaging for the OpenArena engine