This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit c29757becbdefd19b9b5c59b0fc1223ecbc5065d Author: Simon McVittie <s...@debian.org> Date: Fri Oct 28 11:05:02 2016 +0100 d/p/Suppress-compiler-warning-for-unused-BufferToHexString.patch, d/p/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch, d/p/botlib-print-long-int-correctly.patch, d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch, d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch: drop, applied upstream --- debian/changelog | 6 ++++ ...-independent-byteswapping-functions-QINLI.patch | 42 ---------------------- ...-typo-in-Siege-mode-attemtping-attempting.patch | 22 ------------ ...iler-warning-for-unused-BufferToHexString.patch | 31 ---------------- ...sm-to-say-no-servers-found-as-to-say-how-.patch | 28 --------------- .../patches/botlib-print-long-int-correctly.patch | 35 ------------------ debian/patches/series | 5 --- 7 files changed, 6 insertions(+), 163 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6d3ab3..fcfd325 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium with the same endianness - compatibility break: 64-bit saved games made prior to this version are no longer supported + * d/p/Suppress-compiler-warning-for-unused-BufferToHexString.patch, + d/p/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch, + d/p/botlib-print-long-int-correctly.patch, + d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch, + d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch: + drop, applied upstream -- Simon McVittie <s...@debian.org> Fri, 28 Oct 2016 10:57:57 +0100 diff --git a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch b/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch deleted file mode 100644 index 9460ab6..0000000 --- a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Simon McVittie <s...@debian.org> -Date: Wed, 21 Sep 2016 12:59:58 +0100 -Subject: Declare platform-independent byteswapping functions QINLINE -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -In addition to enabling inlining for these very simple functions, -this suppresses warnings from gcc 6: - -…/shared/qcommon/q_platform.h:302:13: warning: 'void CopyShortSwap(void*, const void*)' defined but not used [-Wunused-function] - -Forwarded: https://github.com/JACoders/OpenJK/pull/869 ---- - shared/qcommon/q_platform.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h -index 3ff6e9c..0d60290 100644 ---- a/shared/qcommon/q_platform.h -+++ b/shared/qcommon/q_platform.h -@@ -299,17 +299,17 @@ static inline uint32_t LongSwap(uint32_t v) - } - #endif - --static void CopyShortSwap( void *dest, const void *src ) -+static QINLINE void CopyShortSwap( void *dest, const void *src ) - { - *(uint16_t*)dest = ShortSwap(*(uint16_t*)src); - } - --static void CopyLongSwap( void *dest, const void *src ) -+static QINLINE void CopyLongSwap( void *dest, const void *src ) - { - *(uint32_t*)dest = LongSwap(*(uint32_t*)src); - } - --static float FloatSwap(float f) -+static QINLINE float FloatSwap(float f) - { - float out; - CopyLongSwap(&out, &f); diff --git a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch b/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch deleted file mode 100644 index 3790824..0000000 --- a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Simon McVittie <s...@debian.org> -Date: Sun, 20 Mar 2016 13:47:36 +0000 -Subject: Fix a typo in Siege mode: attemtping -> attempting - -Forwarded: https://github.com/JACoders/OpenJK/pull/868 ---- - codemp/game/ai_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/codemp/game/ai_main.c b/codemp/game/ai_main.c -index 24910a1..f068349 100644 ---- a/codemp/game/ai_main.c -+++ b/codemp/game/ai_main.c -@@ -131,7 +131,7 @@ char *ctfStateDescriptions[] = { - - char *siegeStateDescriptions[] = { - "I'm not occupied", -- "I'm attemtping to complete the current objective", -+ "I'm attempting to complete the current objective", - "I'm preventing the enemy from completing their objective" - }; - diff --git a/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch b/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch deleted file mode 100644 index a22a930..0000000 --- a/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Simon McVittie <s...@debian.org> -Date: Thu, 22 Sep 2016 08:43:34 +0100 -Subject: Suppress compiler warning for unused BufferToHexString - -This function is only called when debugging challenges. - -Forwarded: https://github.com/JACoders/OpenJK/pull/873 ---- - codemp/server/sv_challenge.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/codemp/server/sv_challenge.cpp b/codemp/server/sv_challenge.cpp -index 3bca98b..1331af8 100644 ---- a/codemp/server/sv_challenge.cpp -+++ b/codemp/server/sv_challenge.cpp -@@ -30,6 +30,7 @@ static const size_t SECRET_KEY_LENGTH = MD5_DIGEST_SIZE; // Key length equal to - static qboolean challengerInitialized = qfalse; - static hmacMD5Context_t challenger; - -+#ifdef DEBUG_SV_CHALLENGE - /* - ==================== - BufferToHexString -@@ -52,6 +53,7 @@ static const char *BufferToHexString(byte *buffer, size_t bufferLen) - hexString[bufferLen * 2] = '\0'; - return hexString; - } -+#endif - - /* - ==================== diff --git a/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch b/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch deleted file mode 100644 index eb80777..0000000 --- a/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Simon McVittie <s...@debian.org> -Date: Thu, 22 Sep 2016 08:40:39 +0100 -Subject: Use same mechanism to say "no servers found" as to say how many we - found - -This avoids an array underflow: if no servers were found, we would -write to foundPlayerServerNames[-1], which is undefined behaviour, but -with a reasonable assumption of the stack layout is likely to result -in a write to foundPlayerServerAddresses[MAX - 1]. - -Forwarded: https://github.com/JACoders/OpenJK/pull/870 ---- - codemp/ui/ui_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/codemp/ui/ui_main.c b/codemp/ui/ui_main.c -index 862da52..1f17346 100644 ---- a/codemp/ui/ui_main.c -+++ b/codemp/ui/ui_main.c -@@ -7830,7 +7830,7 @@ static void UI_BuildFindPlayerList(qboolean force) { - // add a line that shows the number of servers found - if (!uiInfo.numFoundPlayerServers) - { -- Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], sizeof(uiInfo.foundPlayerServerAddresses[0]), "no servers found"); -+ trap->Cvar_Set( "ui_playerServersFound", "no servers found" ); - } - else - { diff --git a/debian/patches/botlib-print-long-int-correctly.patch b/debian/patches/botlib-print-long-int-correctly.patch deleted file mode 100644 index 36a133a..0000000 --- a/debian/patches/botlib-print-long-int-correctly.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Simon McVittie <s...@debian.org> -Date: Thu, 22 Sep 2016 08:32:54 +0100 -Subject: botlib: print long int correctly - -value has type long, or equivalently signed long int. In C, -abs(some_long) returns int (to get a long result you would have to use -labs(some_long) due to lack of overloading), but in C++ it returns long. - -Forwarded: https://github.com/JACoders/OpenJK/pull/871 ---- - codemp/botlib/l_precomp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/codemp/botlib/l_precomp.cpp b/codemp/botlib/l_precomp.cpp -index 9560f97..34c094f 100644 ---- a/codemp/botlib/l_precomp.cpp -+++ b/codemp/botlib/l_precomp.cpp -@@ -2510,7 +2510,7 @@ int PC_Directive_eval(source_t *source) - token.whitespace_p = source->scriptstack->script_p; - token.endwhitespace_p = source->scriptstack->script_p; - token.linescrossed = 0; -- sprintf(token.string, "%d", abs(value)); -+ sprintf(token.string, "%ld", abs(value)); - token.type = TT_NUMBER; - token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL; - PC_UnreadSourceToken(source, &token); -@@ -2615,7 +2615,7 @@ int PC_DollarDirective_evalint(source_t *source) - token.whitespace_p = source->scriptstack->script_p; - token.endwhitespace_p = source->scriptstack->script_p; - token.linescrossed = 0; -- sprintf(token.string, "%d", abs(value)); -+ sprintf(token.string, "%ld", abs(value)); - token.type = TT_NUMBER; - token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL; - diff --git a/debian/patches/series b/debian/patches/series index 4ca0236..37977f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,3 @@ -Fix-a-typo-in-Siege-mode-attemtping-attempting.patch -Declare-platform-independent-byteswapping-functions-QINLI.patch Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch -botlib-print-long-int-correctly.patch -Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch -Suppress-compiler-warning-for-unused-BufferToHexString.patch Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits