[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1802-2+dbg-12-ga1a81c1

Simon McVittie smcv at debian.org
Sat Feb 5 22:33:50 UTC 2011


The following commit has been merged in the master branch:
commit fb9b2e252bceefb4dbd8b1729643ddea3ea2e9f0
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Feb 4 22:14:44 2011 +0000

    New upstream release
    
    * New upstream release
      - discard patches that were applied or replaced upstream

diff --git a/debian/changelog b/debian/changelog
index c7fdfa7..71953a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ioquake3 (1.36+svn1802-3) UNRELEASED; urgency=low
+ioquake3 (1.36+svn1858-1) UNRELEASED; urgency=low
 
-  * Mark some patches as applied upstream
-  * Replace patch 0004 with the simpler upstream fix
+  * New upstream release
+    - discard patches that were applied or replaced upstream
 
  -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 20:15:33 +0000
 
diff --git a/debian/patches/0003-FS_CheckPak0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch b/debian/patches/0003-FS_CheckPak0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch
deleted file mode 100644
index 7bd3f59..0000000
--- a/debian/patches/0003-FS_CheckPak0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sat, 7 Aug 2010 00:32:59 +0100
-Subject: [PATCH] FS_CheckPak0: don't require BASEGAME/pak0.pk3 if fs_basegame is not BASEGAME
-
-If fs_basegame is set to another game (like baseoa for OpenArena), *and*
-we're com_standalone, then we don't necessarily need pak0.pk3 at all.
-
-We still clear com_standalone if BASEGAME/pak0.pk3 is found, or if either
-fs_basegame or fs_game is BASEGAME.
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4699
-Forwarded: yes
----
- code/qcommon/files.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 1bc6b6f..3d2a2a4 100644
---- a/code/qcommon/files.c
-+++ b/code/qcommon/files.c
-@@ -2963,9 +2963,10 @@ static void FS_CheckPak0( void )
- 	}
- 
- 	if( (!Cvar_VariableIntegerValue("com_standalone")	||
--	     !fs_gamedirvar->string[0]				||
- 	     !Q_stricmp(fs_gamedirvar->string, BASEGAME)	||
--	     !Q_stricmp(fs_gamedirvar->string, "missionpack") )
-+	     ((!fs_gamedirvar->string[0] ||
-+	       !Q_stricmp(fs_gamedirvar->string, "missionpack")) &&
-+	      !Q_stricmp(fs_basegame->string, BASEGAME)))
- 	     &&
- 	     (!founddemo && (foundPak & 0x1ff) != 0x1ff) )
- 	{
--- 
diff --git a/debian/patches/0004-Clip-cl_mouseAccelOffset-at-0.001-to-avoid-division-.patch b/debian/patches/0004-Clip-cl_mouseAccelOffset-at-0.001-to-avoid-division-.patch
deleted file mode 100644
index 3b10eef..0000000
--- a/debian/patches/0004-Clip-cl_mouseAccelOffset-at-0.001-to-avoid-division-.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 276125d95bcbebd38d5a64a449b1805252f463cc Mon Sep 17 00:00:00 2001
-From: Thilo Schulz <thilo>
-Date: Fri, 4 Feb 2011 17:16:53 +0000
-Subject: [PATCH] Fix division by zero, reported by Simon McVittie
-
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4691
-Origin: upstream, commit:1852
----
- code/client/cl_main.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 770f718..2dbf585 100644
---- a/code/client/cl_main.c
-+++ b/code/client/cl_main.c
-@@ -3127,6 +3127,7 @@ void CL_Init( void ) {
- 	// offset for the power function (for style 1, ignored otherwise)
- 	// this should be set to the max rate value
- 	cl_mouseAccelOffset = Cvar_Get( "cl_mouseAccelOffset", "5", CVAR_ARCHIVE );
-+	Cvar_CheckRange(cl_mouseAccelOffset, 0.001, 50000.0, qfalse);
- 
- 	cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0);
- 
--- 
diff --git a/debian/patches/0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch b/debian/patches/0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
deleted file mode 100644
index 1ca6494..0000000
--- a/debian/patches/0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 21 Jul 2010 23:01:46 +0100
-Subject: [PATCH] FS_FindDll: new function to go through the search path looking for a DLL
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4701
-Applied-upstream: 1.37, commit:1856
-
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index c220265..8c719d0 100644
---- a/code/qcommon/files.c
-+++ b/code/qcommon/files.c
-@@ -1220,6 +1220,32 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
- }
- 
- 
-+char *FS_FindDll( const char *filename ) {
-+	searchpath_t	*search;
-+	directory_t		*dir;
-+
-+	if ( !fs_searchpaths ) {
-+		Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
-+	}
-+
-+	for ( search = fs_searchpaths ; search ; search = search->next ) {
-+		if ( search->dir ) {
-+			FILE *f;
-+			char *netpath;
-+
-+			dir = search->dir;
-+			netpath = FS_BuildOSPath( dir->path, dir->gamedir, filename );
-+			f = fopen( netpath, "rb" );
-+			if (f) {
-+				fclose( f );
-+				return netpath;
-+			}
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
- /*
- =================
- FS_Read
-diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 3a04ba9..04d41e1 100644
---- a/code/qcommon/qcommon.h
-+++ b/code/qcommon/qcommon.h
-@@ -606,6 +606,9 @@ void	FS_FreeFileList( char **list );
- qboolean FS_FileExists( const char *file );
- 
- qboolean FS_CreatePath (char *OSPath);
-+
-+char *FS_FindDll( const char *filename );
-+
- char   *FS_BuildOSPath( const char *base, const char *game, const char *qpath );
- qboolean FS_CompareZipChecksum(const char *zipfile);
- 
-
diff --git a/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch b/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
deleted file mode 100644
index 5a24b32..0000000
--- a/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 21 Jul 2010 19:46:38 +0100
-Subject: [PATCH] Sys_LoadDll: use FS_FindDll
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4701
-Forwarded: yes
-Applied-upstream: 1.37, commit:1856
- 
-diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
-index 1030bcb..65dff8b 100644
---- a/code/sys/sys_main.c
-+++ b/code/sys/sys_main.c
-@@ -407,34 +407,6 @@ void Sys_UnloadDll( void *dllHandle )
- 
- /*
- =================
--Sys_TryLibraryLoad
--=================
--*/
--static void* Sys_TryLibraryLoad(const char* base, const char* gamedir, const char* fname, char* fqpath )
--{
--	void* libHandle;
--	char* fn;
--
--	*fqpath = 0;
--
--	fn = FS_BuildOSPath( base, gamedir, fname );
--	Com_Printf( "Sys_LoadDll(%s)... \n", fn );
--
--	libHandle = Sys_LoadLibrary(fn);
--
--	if(!libHandle) {
--		Com_Printf( "Sys_LoadDll(%s) failed:\n\"%s\"\n", fn, Sys_LibraryError() );
--		return NULL;
--	}
--
--	Com_Printf ( "Sys_LoadDll(%s): succeeded ...\n", fn );
--	Q_strncpyz ( fqpath , fn , MAX_QPATH ) ;
--
--	return libHandle;
--}
--
--/*
--=================
- Sys_LoadDll
- 
- Used to load a development dll instead of a virtual machine
-@@ -449,26 +421,24 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
- 	void  *libHandle;
- 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
- 	char  fname[MAX_OSPATH];
--	char  *basepath;
--	char  *homepath;
--	char  *gamedir;
-+	char  *netpath;
- 
- 	assert( name );
- 
- 	Q_snprintf (fname, sizeof(fname), "%s" ARCH_STRING DLL_EXT, name);
- 
--	// TODO: use fs_searchpaths from files.c
--	basepath = Cvar_VariableString( "fs_basepath" );
--	homepath = Cvar_VariableString( "fs_homepath" );
--	gamedir = Cvar_VariableString( "fs_game" );
-+	netpath = FS_FindDll(fname);
- 
--	libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
-+	if(!netpath) {
-+		Com_Printf( "Sys_LoadDll(%s) could not find it\n", fname );
-+		return NULL;
-+	}
- 
--	if(!libHandle && basepath)
--		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
-+	Com_Printf( "Loading DLL file: %s\n", netpath);
-+	libHandle = Sys_LoadLibrary(netpath);
- 
- 	if(!libHandle) {
--		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
-+		Com_Printf( "Sys_LoadDll(%s) failed:\n\"%s\"\n", netpath, Sys_LibraryError() );
- 		return NULL;
- 	}
- 
diff --git a/debian/patches/0015-Fix-spelling-error.patch b/debian/patches/0015-Fix-spelling-error.patch
deleted file mode 100644
index 2545492..0000000
--- a/debian/patches/0015-Fix-spelling-error.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Mon, 7 Jun 2010 12:55:35 +0900
-Subject: [PATCH] Fix spelling error
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4692
-Applied-upstream: 1.37, commit:1853
----
- code/botlib/be_aas_main.c |    2 +-
- code/botlib/be_ai_chat.c  |    2 +-
- code/botlib/l_precomp.c   |    2 +-
- code/botlib/l_script.c    |    6 +++---
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/code/botlib/be_aas_main.c b/code/botlib/be_aas_main.c
-index 99a183a..0dab57c 100644
---- a/code/botlib/be_aas_main.c
-+++ b/code/botlib/be_aas_main.c
-@@ -216,7 +216,7 @@ void AAS_ContinueInit(float time)
- 		//save the AAS file
- 		if (AAS_WriteAASFile(aasworld.filename))
- 		{
--			botimport.Print(PRT_MESSAGE, "%s written succesfully\n", aasworld.filename);
-+			botimport.Print(PRT_MESSAGE, "%s written successfully\n", aasworld.filename);
- 		} //end if
- 		else
- 		{
-diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c
-index 5092cec..12ca6c2 100644
---- a/code/botlib/be_ai_chat.c
-+++ b/code/botlib/be_ai_chat.c
-@@ -2198,7 +2198,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
- #ifdef DEBUG
- 	botimport.Print(PRT_MESSAGE, "initial chats loaded in %d msec\n", Sys_MilliSeconds() - starttime);
- #endif //DEBUG
--	//character was read succesfully
-+	//character was read successfully
- 	return chat;
- } //end of the function BotLoadInitialChat
- //===========================================================================
-diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
-index 1fe7c14..4257594 100644
---- a/code/botlib/l_precomp.c
-+++ b/code/botlib/l_precomp.c
-@@ -1362,7 +1362,7 @@ define_t *PC_DefineFromString(char *string)
- #endif //DEFINEHASHING
- 	//
- 	FreeScript(script);
--	//if the define was created succesfully
-+	//if the define was created successfully
- 	if (res > 0) return def;
- 	//free the define is created
- 	if (src.defines) PC_FreeDefine(def);
-diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c
-index 2fe628d..f961d56 100644
---- a/code/botlib/l_script.c
-+++ b/code/botlib/l_script.c
-@@ -421,7 +421,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch)
- 	script->script_p++;
- 	//store the escape character
- 	*ch = c;
--	//succesfully read escape character
-+	//successfully read escape character
- 	return 1;
- } //end of the function PS_ReadEscapeCharacter
- //============================================================================
-@@ -431,7 +431,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch)
- //
- // Parameter:				script		: script to read from
- //								token			: buffer to store the string
--// Returns:					qtrue when a string was read succesfully
-+// Returns:					qtrue when a string was read successfully
- // Changes Globals:		-
- //============================================================================
- int PS_ReadString(script_t *script, token_t *token, int quote)
-@@ -912,7 +912,7 @@ int PS_ReadToken(script_t *script, token_t *token)
- 	} //end if
- 	//copy the token into the script structure
- 	Com_Memcpy(&script->token, token, sizeof(token_t));
--	//succesfully read a token
-+	//successfully read a token
- 	return 1;
- } //end of the function PS_ReadToken
- //============================================================================
diff --git a/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
deleted file mode 100644
index 2ce6195..0000000
--- a/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Date: Sun, 18 Jul 2010 00:00:40 +0100
-Subject: [PATCH] Fix FTBFS on kFreeBSD
-
-[Adapted to not actually claim to *be* Linux -smcv]
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4700
-Bug-Debian: http://bugs.debian.org/413617
-Applied-upstream: 1.37, commit:1855
----
- Makefile                  |    4 ++--
- code/qcommon/q_platform.h |    7 ++++++-
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 42d7b98..9bd03a7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@
- # GNU Make required
- #
- 
--COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
-+COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g')
- 
- COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
- 
-@@ -239,7 +239,7 @@ LIB=lib
- INSTALL=install
- MKDIR=mkdir
- 
--ifeq ($(PLATFORM),linux)
-+ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
- 
-   ifeq ($(ARCH),axp)
-     ARCH=alpha
-diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
-index 46758ed..1be979a 100644
---- a/code/qcommon/q_platform.h
-+++ b/code/qcommon/q_platform.h
-@@ -154,11 +154,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
- //================================================================= LINUX ===
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- 
- #include <endian.h>
- 
-+#if defined(__linux__)
- #define OS_STRING "linux"
-+#else
-+#define OS_STRING "kFreeBSD"
-+#endif
-+
- #define ID_INLINE inline
- #define PATH_SEP '/'
- 
--- 
diff --git a/debian/patches/0017-Revert-Followup-to-4733.patch b/debian/patches/0017-Revert-Followup-to-4733.patch
deleted file mode 100644
index 88c45d4..0000000
--- a/debian/patches/0017-Revert-Followup-to-4733.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 65158bf14f43161e5fcd28efb1c1d5fcb0db8f1d Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 11 Nov 2010 19:15:44 +0000
-Subject: [PATCH 1/2] Revert "Followup to #4733"
-
-This reverts commit e996b2d93708d1176f80fb6e86812576cf8b6e7a.
-Zack Middleton points out that it'd break missionpack.
-
-Applied-upstream: 1.37, commit:1845
-
-diff --git a/code/game/bg_public.h b/code/game/bg_public.h
-index 6376b5c..ad5ab39 100644
---- a/code/game/bg_public.h
-+++ b/code/game/bg_public.h
-@@ -103,10 +103,10 @@ typedef enum {
- 
- 	GT_TEAM,			// team deathmatch
- 	GT_CTF,				// capture the flag
--	GT_MAX_GAME_TYPE,		// other gametypes haven't been implemented.
- 	GT_1FCTF,
- 	GT_OBELISK,
--	GT_HARVESTER
-+	GT_HARVESTER,
-+	GT_MAX_GAME_TYPE
- } gametype_t;
- 
- typedef enum { GENDER_MALE, GENDER_FEMALE, GENDER_NEUTER } gender_t;
diff --git a/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch b/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
deleted file mode 100644
index f89a320..0000000
--- a/debian/patches/0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d52094c72e51332c64241751708c55b6e5e22cf5 Mon Sep 17 00:00:00 2001
-From: Zack Middleton <ZTurtleMan gmail com>
-Date: Thu, 11 Nov 2010 19:18:31 +0000
-Subject: [PATCH 2/2] Q3UI: clamp gametype to not overflow gametype_remap2
-
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4733
-Applied-upstream: 1.37, commit:1845
-
-diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
-index 39b2c7f..4230dc3 100644
---- a/code/q3_ui/ui_startserver.c
-+++ b/code/q3_ui/ui_startserver.c
-@@ -1239,7 +1239,8 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
- 
- 	memset( &s_serveroptions, 0 ,sizeof(serveroptions_t) );
- 	s_serveroptions.multiplayer = multiplayer;
--	s_serveroptions.gametype = (int)Com_Clamp( 0, GT_MAX_GAME_TYPE - 1, trap_Cvar_VariableValue( "g_gameType" ) );
-+	s_serveroptions.gametype = (int) Com_Clamp(0, ARRAY_LEN(gametype_remap2) - 1,
-+						trap_Cvar_VariableValue("g_gametype"));
- 	s_serveroptions.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
- 
- 	ServerOptions_Cache();
diff --git a/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch b/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch
deleted file mode 100644
index eb85de2..0000000
--- a/debian/patches/0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f091549a0119e0777dab5008d502155668e0637b Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 11 Nov 2010 22:15:42 +0000
-Subject: [PATCH] Pass client commands to the game VM in PRIMED as well as ACTIVE state
-
-In single-player Team Arena, the player joins a team before they're
-ACTIVE.
-
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4629
-Applied-upstream: 1.37, commit:1847
----
- code/server/sv_client.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/code/server/sv_client.c b/code/server/sv_client.c
-index af002de..e14454a 100644
---- a/code/server/sv_client.c
-+++ b/code/server/sv_client.c
-@@ -1482,7 +1482,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
- 
- 	if (clientOK) {
- 		// pass unknown strings to the game
--		if (!u->name && sv.state == SS_GAME && cl->state == CS_ACTIVE) {
-+		if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE || cl->state == CS_PRIMED)) {
- 			Cmd_Args_Sanitize();
- 			VM_Call( gvm, GAME_CLIENT_COMMAND, cl - svs.clients );
- 		}
diff --git a/debian/patches/series b/debian/patches/series
index 57c50ae..c96893a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,10 @@
 0001-Fix-build-and-resulting-binary-on-alpha.patch
 0002-Import-syslib-JPEG-patch-from-fedora.patch
-0003-FS_CheckPak0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch
-0004-Clip-cl_mouseAccelOffset-at-0.001-to-avoid-division-.patch
 0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
 0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
 0007-Load-demos-using-the-protocol-version-from-the-comma.patch
 0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
-0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
-0010-Sys_LoadDll-use-FS_FindDll.patch
 0011-Double-the-maximum-number-of-cvars.patch
 0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
 0013-Double-the-default-com_hunkMegs-to-128M.patch
 0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
-0015-Fix-spelling-error.patch
-0016-Fix-FTBFS-on-kFreeBSD.patch
-0017-Revert-Followup-to-4733.patch
-0018-Q3UI-clamp-gametype-to-not-overflow-gametype_remap2.patch
-0019-Pass-client-commands-to-the-game-VM-in-PRIMED-as-wel.patch
diff --git a/debian/rules b/debian/rules
index 4182249..6222c51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ override_dh_auto_build:
 # ---------------------------------------------------------------------------
 
 ORIG_REL = 1.36
-ORIG_REV = 1802
+ORIG_REV = 1858
 # SUFFIX can be made non-empty for re-repacks
 ORIG_SUFFIX =
 

-- 
Quake 3 engine



More information about the Pkg-games-commits mailing list