[SCM] Quake 3 engine branch, master, updated. f9474eeba468251086e341ca4362614664280427

Simon McVittie smcv at debian.org
Fri Aug 13 23:51:28 UTC 2010 

The following commit has been merged in the master branch:
commit 647b17d6ad83b37ec96fe0d367d7928fffe7affb
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Aug 13 19:35:54 2010 +0100

    Tag patches that I've sent upstream

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 3d7d398..50e6855 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
@@ -4,9 +4,10 @@ Subject: [PATCH] Fix build and resulting binary on alpha
 
 [Patch adjusted for current ioquake3 -smcv]
 
-Origin: vendor
+Origin: vendor, Debian
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4703
 Bug-Debian: http://bugs.debian.org/410555
-Forwarded: no
+Forwarded: yes
 ---
  Makefile |    9 +++++++--
  1 files changed, 7 insertions(+), 2 deletions(-)
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 7216089..bdfdf01 100644
--- a/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
+++ b/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
@@ -4,6 +4,7 @@ Subject: [PATCH] Import syslib JPEG patch from fedora
 
 Origin: vendor, Fedora
 Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4564
+Forwarded: yes
 ---
  Makefile                     |   86 +++++++++++++---------
  code/jpeg-6b/jmemnobs.c      |   21 ++++++
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
index cb10445..7bd3f59 100644
--- 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
@@ -8,8 +8,9 @@ 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
-Forwarded: no
+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/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 f3b22dd..f1e1f21 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
@@ -3,7 +3,8 @@ Date: Fri, 6 Aug 2010 20:26:40 +0100
 Subject: [PATCH] FS_FOpenFileRead: allow loading any demo, not just the current protocol
 
 Origin: vendor, Debian
-Forwarded: no
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
+Forwarded: yes
 ---
  code/qcommon/files.c |   12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)
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 e24b18f..8350d2c 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
@@ -10,7 +10,8 @@ OpenArena >= 0.8.1 can use:
     ioquake3 +set protocol 71 [...]
 
 Origin: vendor, Debian
-Forwarded: no
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
+Forwarded: yes
 ---
  code/client/cl_main.c   |    4 ++--
  code/qcommon/common.c   |    2 ++
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 d565cd3..58208c0 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
@@ -3,7 +3,8 @@ Date: Fri, 6 Aug 2010 20:37:48 +0100
 Subject: [PATCH] Load demos using the protocol version from the command line, if overridden
 
 Origin: vendor, Debian
-Forwarded: no
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
+Forwarded: yes
 ---
  code/client/cl_main.c |   21 +++++++++++++++++----
  1 files changed, 17 insertions(+), 4 deletions(-)
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 b3790dd..0ce388c 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
@@ -3,7 +3,8 @@ 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
-Forwarded: no
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4701
+Forwarded: yes
 ---
  code/qcommon/files.c   |   26 ++++++++++++++++++++++++++
  code/qcommon/qcommon.h |    3 +++
diff --git a/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch b/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
index bd7c1bc..6481255 100644
--- a/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
+++ b/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
@@ -3,7 +3,8 @@ Date: Wed, 21 Jul 2010 19:46:38 +0100
 Subject: [PATCH] Sys_LoadDll: use FS_FindDll
 
 Origin: vendor, Debian
-Forwarded: no
+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(-)
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 1e29937..b72f66e 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
@@ -5,7 +5,8 @@ Subject: [PATCH] Put g_humanplayers and g_needpass in server info
 OpenArena uses these in its UI, and they seem like useful things to know.
 
 Origin: OpenArena
-Forwarded: no
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4702
+Forwarded: yes
 ---
  code/client/cl_main.c |    4 ++++
  code/client/cl_ui.c   |    2 ++
diff --git a/debian/patches/0015-Fix-spelling-error.patch b/debian/patches/0015-Fix-spelling-error.patch
index 19ac8d2..8b8243a 100644
--- a/debian/patches/0015-Fix-spelling-error.patch
+++ b/debian/patches/0015-Fix-spelling-error.patch
@@ -4,6 +4,7 @@ Subject: [PATCH] Fix spelling error
 
 Origin: vendor, Debian
 Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4692
+Forwarded: yes
 ---
  code/botlib/be_aas_main.c |    2 +-
  code/botlib/be_ai_chat.c  |    2 +-
diff --git a/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
index 0e972c2..e906890 100644
--- a/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
+++ b/debian/patches/0016-Fix-FTBFS-on-kFreeBSD.patch
@@ -5,8 +5,9 @@ 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
-Forwarded: no
+Forwarded: yes
 ---
  Makefile                  |    4 ++--
  code/qcommon/q_platform.h |    7 ++++++-

-- 
Quake 3 engine

More information about the Pkg-games-commits mailing list