[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:49 UTC 2011
The following commit has been merged in the master branch:
commit 8c6a39b87d988d24329e48a74d19b58c5f587061
Author: Simon McVittie <smcv at debian.org>
Date: Fri Feb 4 20:15:57 2011 +0000
Mark some patches as applied upstream
diff --git a/debian/changelog b/debian/changelog
index 33372ba..de178c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ioquake3 (1.36+svn1802-3) UNRELEASED; urgency=low
+
+ * Mark some patches as applied upstream
+
+ -- Simon McVittie <smcv at debian.org> Fri, 04 Feb 2011 20:15:33 +0000
+
ioquake3 (1.36+svn1802-2) unstable; urgency=low
* Correct patch 0014 so the variables are correctly formatted as strings
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
index 0ce388c..1ca6494 100644
--- 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
@@ -4,17 +4,13 @@ Subject: [PATCH] FS_FindDll: new function to go through the search path looking
Origin: vendor, Debian
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4701
-Forwarded: yes
----
- code/qcommon/files.c | 26 ++++++++++++++++++++++++++
- code/qcommon/qcommon.h | 3 +++
- 2 files changed, 29 insertions(+), 0 deletions(-)
+Applied-upstream: 1.37, commit:1856
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 9e76a0b..c52e113 100644
+index c220265..8c719d0 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1218,6 +1218,32 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
+@@ -1220,6 +1220,32 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
}
@@ -48,10 +44,10 @@ index 9e76a0b..c52e113 100644
=================
FS_Read
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 6698454..30ab601 100644
+index 3a04ba9..04d41e1 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -605,6 +605,9 @@ void FS_FreeFileList( char **list );
+@@ -606,6 +606,9 @@ void FS_FreeFileList( char **list );
qboolean FS_FileExists( const char *file );
qboolean FS_CreatePath (char *OSPath);
@@ -61,4 +57,4 @@ index 6698454..30ab601 100644
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
index 6481255..5a24b32 100644
--- a/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
+++ b/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
@@ -5,15 +5,13 @@ Subject: [PATCH] Sys_LoadDll: use FS_FindDll
Origin: vendor, Debian
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4701
Forwarded: yes
----
- code/sys/sys_main.c | 48 +++++++++---------------------------------------
- 1 files changed, 9 insertions(+), 39 deletions(-)
-
+Applied-upstream: 1.37, commit:1856
+
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
-index 91c54f1..923ecf3 100644
+index 1030bcb..65dff8b 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
-@@ -402,34 +402,6 @@ void Sys_UnloadDll( void *dllHandle )
+@@ -407,34 +407,6 @@ void Sys_UnloadDll( void *dllHandle )
/*
=================
@@ -48,7 +46,7 @@ index 91c54f1..923ecf3 100644
Sys_LoadDll
Used to load a development dll instead of a virtual machine
-@@ -444,26 +416,24 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
+@@ -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];
@@ -84,4 +82,3 @@ index 91c54f1..923ecf3 100644
return NULL;
}
---
diff --git a/debian/patches/0015-Fix-spelling-error.patch b/debian/patches/0015-Fix-spelling-error.patch
index 8b8243a..2545492 100644
--- a/debian/patches/0015-Fix-spelling-error.patch
+++ b/debian/patches/0015-Fix-spelling-error.patch
@@ -4,7 +4,7 @@ Subject: [PATCH] Fix spelling error
Origin: vendor, Debian
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4692
-Forwarded: yes
+Applied-upstream: 1.37, commit:1853
---
code/botlib/be_aas_main.c | 2 +-
code/botlib/be_ai_chat.c | 2 +-
@@ -82,4 +82,3 @@ index 2fe628d..f961d56 100644
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
index e906890..2ce6195 100644
--- a/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
+++ b/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
@@ -7,14 +7,14 @@ Subject: [PATCH] Fix FTBFS on kFreeBSD
Origin: vendor, Debian
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4700
Bug-Debian: http://bugs.debian.org/413617
-Forwarded: yes
+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 7cc2991..9d476b4 100644
+index 42d7b98..9bd03a7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
@@ -26,7 +26,7 @@ index 7cc2991..9d476b4 100644
COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
-@@ -243,7 +243,7 @@ LIB=lib
+@@ -239,7 +239,7 @@ LIB=lib
INSTALL=install
MKDIR=mkdir
@@ -36,7 +36,7 @@ index 7cc2991..9d476b4 100644
ifeq ($(ARCH),axp)
ARCH=alpha
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
-index 65f1fb2..3004fef 100644
+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
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
index ff949f1..eb85de2 100644
--- 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
@@ -7,16 +7,16 @@ In single-player Team Arena, the player joins a team before they're
ACTIVE.
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4629
-Forwarded: yes
+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 d6c355a..130cb62 100644
+index af002de..e14454a 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
-@@ -1478,7 +1478,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
+@@ -1482,7 +1482,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
if (clientOK) {
// pass unknown strings to the game
@@ -25,6 +25,3 @@ index d6c355a..130cb62 100644
Cmd_Args_Sanitize();
VM_Call( gvm, GAME_CLIENT_COMMAND, cl - svs.clients );
}
---
-1.7.2.3
-
--
Quake 3 engine
More information about the Pkg-games-commits
mailing list