[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:54 UTC 2011


The following commit has been merged in the master branch:
commit ceec6c9b61ee23a2a70b5ca2e8ddfcfc08333b11
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Feb 4 23:03:31 2011 +0000

    refresh remaining patches

diff --git a/debian/changelog b/debian/changelog
index 71953a7..c2d515a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ioquake3 (1.36+svn1858-1) UNRELEASED; urgency=low
 
   * New upstream release
     - discard patches that were applied or replaced upstream
+    - refresh remaining patches
 
  -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 20:15:33 +0000
 
diff --git a/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch b/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
index 50e6855..5da6626 100644
--- a/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
+++ b/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
@@ -13,12 +13,12 @@ Forwarded: yes
  1 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 394c139..1dd0235 100644
+index 9bd03a7..bbc5d24 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,8 @@ MKDIR=mkdir
  
- ifeq ($(PLATFORM),linux)
+ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
  
 -  ifeq ($(ARCH),alpha)
 -    ARCH=axp
@@ -27,7 +27,7 @@ index 394c139..1dd0235 100644
    else
    ifeq ($(ARCH),x86_64)
      LIB=lib64
-@@ -310,6 +310,11 @@ ifeq ($(PLATFORM),linux)
+@@ -310,6 +310,11 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
      OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
      HAVE_VM_COMPILED=true
    endif
diff --git a/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch b/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
index bdfdf01..d0fb656 100644
--- a/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
+++ b/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
@@ -16,7 +16,7 @@ Forwarded: yes
  create mode 100644 code/renderer/jpeg_memsrc.h
 
 diff --git a/Makefile b/Makefile
-index 1dd0235..7cc2991 100644
+index bbc5d24..1657476 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -107,6 +107,10 @@ ifndef GENERATE_DEPENDENCIES
@@ -30,7 +30,7 @@ index 1dd0235..7cc2991 100644
  ifndef USE_OPENAL
  USE_OPENAL=1
  endif
-@@ -262,6 +266,10 @@ ifeq ($(PLATFORM),linux)
+@@ -262,6 +266,10 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
    CLIENT_CFLAGS = $(SDL_CFLAGS)
    SERVER_CFLAGS =
  
@@ -41,7 +41,7 @@ index 1dd0235..7cc2991 100644
    ifeq ($(USE_OPENAL),1)
      CLIENT_CFLAGS += -DUSE_OPENAL
      ifeq ($(USE_OPENAL_DLOPEN),1)
-@@ -331,6 +339,10 @@ ifeq ($(PLATFORM),linux)
+@@ -331,6 +339,10 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
  
    CLIENT_LIBS=$(SDL_LIBS) -lGL
  
diff --git a/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch b/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
index f1e1f21..25d9cc7 100644
--- a/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
+++ b/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
@@ -10,10 +10,10 @@ Forwarded: yes
  1 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 3d2a2a4..9e76a0b 100644
+index 8c719d0..1a39917 100644
 --- a/code/qcommon/files.c
 +++ b/code/qcommon/files.c
-@@ -992,6 +992,14 @@ qboolean FS_FilenameCompare( const char *s1, const char *s2 ) {
+@@ -1000,6 +1000,14 @@ qboolean FS_FilenameCompare( const char *s1, const char *s2 ) {
  	return qfalse;		// strings are equal
  }
  
@@ -28,7 +28,7 @@ index 3d2a2a4..9e76a0b 100644
  /*
  ===========
  FS_FOpenFileRead
-@@ -1013,7 +1021,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
+@@ -1021,7 +1029,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
  	long			hash;
  	FILE			*temp;
  	int				l;
@@ -36,7 +36,7 @@ index 3d2a2a4..9e76a0b 100644
  
  	hash = 0;
  
-@@ -1060,7 +1067,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
+@@ -1068,7 +1075,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
  		Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed\n" );
  	}
  
@@ -44,7 +44,7 @@ index 3d2a2a4..9e76a0b 100644
  	// qpaths are not supposed to have a leading slash
  	if ( filename[0] == '/' || filename[0] == '\\' ) {
  		filename++;
-@@ -1177,7 +1183,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
+@@ -1185,7 +1191,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
  				if ( Q_stricmp( filename + l - 4, ".cfg" )		// for config files
  					&& Q_stricmp( filename + l - 5, ".menu" )	// menu files
  					&& Q_stricmp( filename + l - 5, ".game" )	// menu files
diff --git a/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch b/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
index 8350d2c..ba87cbc 100644
--- a/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
+++ b/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
@@ -22,10 +22,10 @@ Forwarded: yes
  6 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 2b4be3a..0ea6d7c 100644
+index 5cbd649..016c7b8 100644
 --- a/code/client/cl_main.c
 +++ b/code/client/cl_main.c
-@@ -2121,7 +2121,7 @@ void CL_CheckForResend( void ) {
+@@ -2123,7 +2123,7 @@ void CL_CheckForResend( void ) {
  		port = Cvar_VariableValue ("net_qport");
  
  		Q_strncpyz( info, Cvar_InfoString( CVAR_USERINFO ), sizeof( info ) );
@@ -34,7 +34,7 @@ index 2b4be3a..0ea6d7c 100644
  		Info_SetValueForKey( info, "qport", va("%i", port ) );
  		Info_SetValueForKey( info, "challenge", va("%i", clc.challenge ) );
  		
-@@ -3386,7 +3386,7 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
+@@ -3391,7 +3391,7 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
  
  	// if this isn't the correct protocol version, ignore it
  	prot = atoi( Info_ValueForKey( infoString, "protocol" ) );
@@ -44,18 +44,18 @@ index 2b4be3a..0ea6d7c 100644
  		return;
  	}
 diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 64ec51d..d6c0532 100644
+index 73e82fb..f7a4edf 100644
 --- a/code/qcommon/common.c
 +++ b/code/qcommon/common.c
-@@ -84,6 +84,7 @@ cvar_t	*com_minimized;
- cvar_t	*com_maxfpsMinimized;
- cvar_t	*com_abnormalExit;
- cvar_t	*com_standalone;
+@@ -86,6 +86,7 @@ cvar_t	*com_standalone;
+ cvar_t	*com_basegame;
+ cvar_t  *com_homepath;
+ cvar_t	*com_busyWait;
 +cvar_t	*sv_protocol;
  
  // com_speeds times
  int		time_game;
-@@ -2745,6 +2746,7 @@ void Com_Init( char *commandLine ) {
+@@ -2705,6 +2706,7 @@ void Com_Init( char *commandLine ) {
  
  	s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
  	com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
@@ -64,10 +64,10 @@ index 64ec51d..d6c0532 100644
  	Sys_Init();
  
 diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index c6a61e2..6698454 100644
+index 04d41e1..ffcbf94 100644
 --- a/code/qcommon/qcommon.h
 +++ b/code/qcommon/qcommon.h
-@@ -839,6 +839,8 @@ extern	cvar_t	*sv_paused;
+@@ -848,6 +848,8 @@ extern	cvar_t	*sv_paused;
  extern	cvar_t	*cl_packetdelay;
  extern	cvar_t	*sv_packetdelay;
  
@@ -77,7 +77,7 @@ index c6a61e2..6698454 100644
  extern	int		time_game;
  extern	int		time_frontend;
 diff --git a/code/server/sv_client.c b/code/server/sv_client.c
-index 1195c88..657c936 100644
+index e14454a..3de54e7 100644
 --- a/code/server/sv_client.c
 +++ b/code/server/sv_client.c
 @@ -302,8 +302,8 @@ void SV_DirectConnect( netadr_t from ) {
@@ -92,10 +92,10 @@ index 1195c88..657c936 100644
  		return;
  	}
 diff --git a/code/server/sv_init.c b/code/server/sv_init.c
-index bac7fa4..07f11d1 100644
+index 875961e..39b06a0 100644
 --- a/code/server/sv_init.c
 +++ b/code/server/sv_init.c
-@@ -633,7 +633,6 @@ void SV_Init (void) {
+@@ -636,7 +636,6 @@ void SV_Init (void)
  	Cvar_Get ("timelimit", "0", CVAR_SERVERINFO);
  	sv_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH );
  	Cvar_Get ("sv_keywords", "", CVAR_SERVERINFO);
@@ -104,10 +104,10 @@ index bac7fa4..07f11d1 100644
  	sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
  	sv_hostname = Cvar_Get ("sv_hostname", "noname", CVAR_SERVERINFO | CVAR_ARCHIVE );
 diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 67d7d51..9f20128 100644
+index 3cb9f4f..17afd3b 100644
 --- a/code/server/sv_main.c
 +++ b/code/server/sv_main.c
-@@ -634,7 +634,7 @@ void SVC_Info( netadr_t from ) {
+@@ -637,7 +637,7 @@ void SVC_Info( netadr_t from ) {
  	// to prevent timed spoofed reply packets that add ghost servers
  	Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
  
diff --git a/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch b/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
index 58208c0..7e7cad9 100644
--- a/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
+++ b/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
@@ -10,10 +10,10 @@ Forwarded: yes
  1 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 0ea6d7c..15cf3db 100644
+index 016c7b8..726ecfb 100644
 --- a/code/client/cl_main.c
 +++ b/code/client/cl_main.c
-@@ -624,14 +624,14 @@ void CL_Record_f( void ) {
+@@ -626,14 +626,14 @@ void CL_Record_f( void ) {
  	if ( Cmd_Argc() == 2 ) {
  		s = Cmd_Argv(1);
  		Q_strncpyz( demoName, s, sizeof( demoName ) );
@@ -30,7 +30,7 @@ index 0ea6d7c..15cf3db 100644
  
  			if (!FS_FileExists(name))
  				break;	// file doesn't exist
-@@ -881,6 +881,19 @@ static void CL_WalkDemoExt(char *arg, char *name, int *demofile)
+@@ -883,6 +883,19 @@ static void CL_WalkDemoExt(char *arg, char *name, int *demofile)
  {
  	int i = 0;
  	*demofile = 0;
@@ -50,7 +50,7 @@ index 0ea6d7c..15cf3db 100644
  	while(demo_protocols[i])
  	{
  		Com_sprintf (name, MAX_OSPATH, "demos/%s.dm_%d", arg, demo_protocols[i]);
-@@ -907,7 +920,7 @@ static void CL_CompleteDemoName( char *args, int argNum )
+@@ -909,7 +922,7 @@ static void CL_CompleteDemoName( char *args, int argNum )
  	{
  		char demoExt[ 16 ];
  
@@ -59,7 +59,7 @@ index 0ea6d7c..15cf3db 100644
  		Field_CompleteFilename( "demos", demoExt, qtrue );
  	}
  }
-@@ -955,7 +968,7 @@ void CL_PlayDemo_f( void ) {
+@@ -957,7 +970,7 @@ void CL_PlayDemo_f( void ) {
  				break;
  			i++;
  		}
diff --git a/debian/patches/0011-Double-the-maximum-number-of-cvars.patch b/debian/patches/0011-Double-the-maximum-number-of-cvars.patch
index eaa5699..8eafc51 100644
--- a/debian/patches/0011-Double-the-maximum-number-of-cvars.patch
+++ b/debian/patches/0011-Double-the-maximum-number-of-cvars.patch
@@ -13,7 +13,7 @@ Forwarded: no
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
-index 3558f0f..15715bc 100644
+index bae4154..d06eb8f 100644
 --- a/code/qcommon/cvar.c
 +++ b/code/qcommon/cvar.c
 @@ -28,7 +28,7 @@ cvar_t		*cvar_vars = NULL;
diff --git a/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch b/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
index 5a2d620..49f706c 100644
--- a/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
+++ b/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
@@ -9,7 +9,7 @@ Forwarded: no
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
-index f1243b3..349ff7d 100644
+index f40b5bd..553536e 100644
 --- a/code/qcommon/cmd.c
 +++ b/code/qcommon/cmd.c
 @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch b/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
index 8974a89..7e08b24 100644
--- a/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
+++ b/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
@@ -12,7 +12,7 @@ Forwarded: no
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index d6c0532..ef022e3 100644
+index f7a4edf..1bebf1a 100644
 --- a/code/qcommon/common.c
 +++ b/code/qcommon/common.c
 @@ -38,7 +38,7 @@ int demo_protocols[] =
diff --git a/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch b/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
index f0c42fc..2a24106 100644
--- a/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
+++ b/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
@@ -15,10 +15,10 @@ Forwarded: yes
  4 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 15cf3db..6e897fa 100644
+index 726ecfb..c966910 100644
 --- a/code/client/cl_main.c
 +++ b/code/client/cl_main.c
-@@ -3356,6 +3356,8 @@ static void CL_SetServerInfo(serverInfo_t *server, const char *info, int ping) {
+@@ -3361,6 +3361,8 @@ static void CL_SetServerInfo(serverInfo_t *server, const char *info, int ping) {
  			server->minPing = atoi(Info_ValueForKey(info, "minping"));
  			server->maxPing = atoi(Info_ValueForKey(info, "maxping"));
  			server->punkbuster = atoi(Info_ValueForKey(info, "punkbuster"));
@@ -27,7 +27,7 @@ index 15cf3db..6e897fa 100644
  		}
  		server->ping = ping;
  	}
-@@ -3474,6 +3476,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
+@@ -3479,6 +3481,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
  	cls.localServers[i].gameType = 0;
  	cls.localServers[i].netType = from.type;
  	cls.localServers[i].punkbuster = 0;
@@ -63,10 +63,10 @@ index 7891a83..c105fb8 100644
  
  typedef struct {
 diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 9f20128..0878544 100644
+index 17afd3b..c9c346e 100644
 --- a/code/server/sv_main.c
 +++ b/code/server/sv_main.c
-@@ -659,6 +659,8 @@ void SVC_Info( netadr_t from ) {
+@@ -662,6 +662,8 @@ void SVC_Info( netadr_t from ) {
  	if( *gamedir ) {
  		Info_SetValueForKey( infostring, "game", gamedir );
  	}

-- 
Quake 3 engine



More information about the Pkg-games-commits mailing list