[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

Simon McVittie smcv at debian.org
Thu Jul 29 20:16:32 UTC 2010 

The following commit has been merged in the master branch:
commit 9372e3fd1c9ccfa9e8aa72ec906c3869a655f19d
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 21:02:33 2010 +0100

    Attribute OA patches to sago007; distinguish between our two upstreams

diff --git a/debian/patches/0001-OpenArena-branding-change-SDL-window-Quake-3-icon-to.patch b/debian/patches/0001-OpenArena-branding-change-SDL-window-Quake-3-icon-to.patch
index 023ec97..8bbf9c5 100644
--- a/debian/patches/0001-OpenArena-branding-change-SDL-window-Quake-3-icon-to.patch
+++ b/debian/patches/0001-OpenArena-branding-change-SDL-window-Quake-3-icon-to.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 03:30:05 +0100
 Subject: [PATCH] OpenArena branding: change SDL window Quake 3 icon to be an OA icon
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/sdl/sdl_icon.h |  272 +++++++++++++++++++++++++-------------------
  1 files changed, 155 insertions(+), 117 deletions(-)
diff --git a/debian/patches/0002-Use-OpenArena-directory-names-in-HOME-on-Unix-Window.patch b/debian/patches/0002-Use-OpenArena-directory-names-in-HOME-on-Unix-Window.patch
index cddd7e1..9bb8693 100644
--- a/debian/patches/0002-Use-OpenArena-directory-names-in-HOME-on-Unix-Window.patch
+++ b/debian/patches/0002-Use-OpenArena-directory-names-in-HOME-on-Unix-Window.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 01:59:45 +0100
 Subject: [PATCH] Use OpenArena directory names in $HOME (on Unix, Windows, Mac)
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/sys/sys_unix.c  |    4 ++--
  engine/code/sys/sys_win32.c |    2 +-
diff --git a/debian/patches/0003-Replace-the-conditionalized-hard-coded-names-in-q_sh.patch b/debian/patches/0003-Replace-the-conditionalized-hard-coded-names-in-q_sh.patch
index 2fed5a0..a8971f3 100644
--- a/debian/patches/0003-Replace-the-conditionalized-hard-coded-names-in-q_sh.patch
+++ b/debian/patches/0003-Replace-the-conditionalized-hard-coded-names-in-q_sh.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:00:04 +0100
 Subject: [PATCH] Replace the conditionalized hard-coded names in q_shared.h with OpenArena
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/q_shared.h |   18 +++++-------------
  1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0004-OpenArena-adjustable-console-size.patch b/debian/patches/0004-OpenArena-adjustable-console-size.patch
index 613bf5a..6f364bd 100644
--- a/debian/patches/0004-OpenArena-adjustable-console-size.patch
+++ b/debian/patches/0004-OpenArena-adjustable-console-size.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:03:34 +0100
 Subject: [PATCH] OpenArena adjustable console size (?)
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/cl_console.c |   38 ++++++++++++++++++++++++++++++++++----
  engine/code/client/cl_keys.c    |   10 +++++++++-
diff --git a/debian/patches/0006-Remove-punkbuster-flag-from-server-info.patch b/debian/patches/0006-Remove-punkbuster-flag-from-server-info.patch
index 8695f67..97893a2 100644
--- a/debian/patches/0006-Remove-punkbuster-flag-from-server-info.patch
+++ b/debian/patches/0006-Remove-punkbuster-flag-from-server-info.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:09:11 +0100
 Subject: [PATCH] Remove punkbuster flag from server info
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/cl_main.c |    2 --
  engine/code/client/cl_ui.c   |    1 -
diff --git a/debian/patches/0007-Don-t-send-heartbeat-to-master-servers-unless-new-sv.patch b/debian/patches/0007-Don-t-send-heartbeat-to-master-servers-unless-new-sv.patch
index fc93121..a0244b2 100644
--- a/debian/patches/0007-Don-t-send-heartbeat-to-master-servers-unless-new-sv.patch
+++ b/debian/patches/0007-Don-t-send-heartbeat-to-master-servers-unless-new-sv.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:10:16 +0100
 Subject: [PATCH] Don't send heartbeat to master servers unless new sv_public cvar is true
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/server/server.h  |    1 +
  engine/code/server/sv_init.c |    1 +
diff --git a/debian/patches/0009-Include-g_needpass-and-g_humanplayers-in-server-info.patch b/debian/patches/0009-Include-g_needpass-and-g_humanplayers-in-server-info.patch
index fd845f0..823f5c8 100644
--- a/debian/patches/0009-Include-g_needpass-and-g_humanplayers-in-server-info.patch
+++ b/debian/patches/0009-Include-g_needpass-and-g_humanplayers-in-server-info.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:12:10 +0100
 Subject: [PATCH] Include g_needpass and g_humanplayers in server info
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/cl_main.c |    2 ++
  engine/code/client/cl_ui.c   |    2 ++
diff --git a/debian/patches/0010-CL_MouseMove-some-sort-of-mouse-acceleration-tweak.patch b/debian/patches/0010-CL_MouseMove-some-sort-of-mouse-acceleration-tweak.patch
index 806797d..db232cb 100644
--- a/debian/patches/0010-CL_MouseMove-some-sort-of-mouse-acceleration-tweak.patch
+++ b/debian/patches/0010-CL_MouseMove-some-sort-of-mouse-acceleration-tweak.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:12:33 +0100
 Subject: [PATCH] CL_MouseMove: some sort of mouse acceleration tweak?
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/cl_input.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0011-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch b/debian/patches/0011-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
index 1d35e8b..54e858f 100644
--- a/debian/patches/0011-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
+++ b/debian/patches/0011-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
@@ -2,7 +2,7 @@ From: ludwig <unknown>
 Date: Sun, 28 Feb 2010 08:58:03 +0000
 Subject: [PATCH] enable (dummy) cdkey calls in standalone mode to prevents mods from crashing
 
-Origin: upstream, svn://svn.icculus.org/quake3/trunk@1777
+Origin: upstream, ioquake3, svn://svn.icculus.org/quake3/trunk@1777
 git-svn-id: svn://svn.icculus.org/quake3/trunk@1777 edf5b092-35ff-0310-97b2-ce42778d08ea
 ---
  engine/code/client/cl_main.c |    6 ++++--
diff --git a/debian/patches/0012-S_CodecLoad-if-a-.wav-audio-file-isn-t-found-load-a-.patch b/debian/patches/0012-S_CodecLoad-if-a-.wav-audio-file-isn-t-found-load-a-.patch
index 854127b..457dee0 100644
--- a/debian/patches/0012-S_CodecLoad-if-a-.wav-audio-file-isn-t-found-load-a-.patch
+++ b/debian/patches/0012-S_CodecLoad-if-a-.wav-audio-file-isn-t-found-load-a-.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:14:43 +0100
 Subject: [PATCH] S_CodecLoad: if a .wav audio file isn't found, load a .ogg equivalent
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/snd_codec.c |   74 +++++++++++++++++++++++++++++++++++++--
  1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/debian/patches/0013-Use-silence-as-the-default-sound.patch b/debian/patches/0013-Use-silence-as-the-default-sound.patch
index d87695c..9722736 100644
--- a/debian/patches/0013-Use-silence-as-the-default-sound.patch
+++ b/debian/patches/0013-Use-silence-as-the-default-sound.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:14:57 +0100
 Subject: [PATCH] Use silence as the default sound
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/snd_dma.c    |    2 +-
  engine/code/client/snd_openal.c |    2 +-
diff --git a/debian/patches/0014-Increase-command-buffer-to-128K.patch b/debian/patches/0014-Increase-command-buffer-to-128K.patch
index 4aa2642..48e5b4c 100644
--- a/debian/patches/0014-Increase-command-buffer-to-128K.patch
+++ b/debian/patches/0014-Increase-command-buffer-to-128K.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:15:14 +0100
 Subject: [PATCH] Increase command buffer to 128K
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/cmd.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0015-Change-to-protocol-71-OpenArena-0.8.1-with-support-f.patch b/debian/patches/0015-Change-to-protocol-71-OpenArena-0.8.1-with-support-f.patch
index 8cd5ea3..ba102d1 100644
--- a/debian/patches/0015-Change-to-protocol-71-OpenArena-0.8.1-with-support-f.patch
+++ b/debian/patches/0015-Change-to-protocol-71-OpenArena-0.8.1-with-support-f.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:16:10 +0100
 Subject: [PATCH] Change to protocol 71 (OpenArena 0.8.1), with support for 68-70 in demos
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/common.c  |    2 +-
  engine/code/qcommon/qcommon.h |    6 +++++-
diff --git a/debian/patches/0016-Allow-the-server-to-set-sv_fps-pmove_fixed-pmove_mse.patch b/debian/patches/0016-Allow-the-server-to-set-sv_fps-pmove_fixed-pmove_mse.patch
index 193d17e..f064103 100644
--- a/debian/patches/0016-Allow-the-server-to-set-sv_fps-pmove_fixed-pmove_mse.patch
+++ b/debian/patches/0016-Allow-the-server-to-set-sv_fps-pmove_fixed-pmove_mse.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:17:01 +0100
 Subject: [PATCH] Allow the server to set sv_fps, pmove_fixed, pmove_msec and g_synchronousClients on clients
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/client/cl_parse.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0017-Increase-default-com_hunkmegs-to-128M.patch b/debian/patches/0017-Increase-default-com_hunkmegs-to-128M.patch
index a7724d3..5f2697b 100644
--- a/debian/patches/0017-Increase-default-com_hunkmegs-to-128M.patch
+++ b/debian/patches/0017-Increase-default-com_hunkmegs-to-128M.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:17:26 +0100
 Subject: [PATCH] Increase default com_hunkmegs to 128M
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/common.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0018-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch b/debian/patches/0018-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
index 2387404..53d52e0 100644
--- a/debian/patches/0018-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
+++ b/debian/patches/0018-bug-4357-CVAR_ROM-CVAR_ARCHIVE-is-not-read-from-q3co.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] * (bug #4357) CVAR_ROM+CVAR_ARCHIVE is not read from q3config
 [OpenArena's engine has another patch with the same practical effect. -smcv]
 
 Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4357
-Origin: upstream, svn://svn.icculus.org/quake3/trunk@1760
+Origin: upstream, ioquake3, svn://svn.icculus.org/quake3/trunk@1760
 git-svn-id: svn://svn.icculus.org/quake3/trunk@1760 edf5b092-35ff-0310-97b2-ce42778d08ea
 ---
  engine/code/q3_ui/ui_main.c |   14 +++++++-------
diff --git a/debian/patches/0019-Turn-FS_CheckPak0-into-a-stub.patch b/debian/patches/0019-Turn-FS_CheckPak0-into-a-stub.patch
index 596c3d3..abcd718 100644
--- a/debian/patches/0019-Turn-FS_CheckPak0-into-a-stub.patch
+++ b/debian/patches/0019-Turn-FS_CheckPak0-into-a-stub.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:19:03 +0100
 Subject: [PATCH] Turn FS_CheckPak0 into a stub
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/files.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/0020-Knock-out-the-update-server.patch b/debian/patches/0020-Knock-out-the-update-server.patch
index d277d2a..f542d22 100644
--- a/debian/patches/0020-Knock-out-the-update-server.patch
+++ b/debian/patches/0020-Knock-out-the-update-server.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:19:16 +0100
 Subject: [PATCH] Knock out the update server
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/qcommon.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0021-Use-the-OpenArena-master-server.patch b/debian/patches/0021-Use-the-OpenArena-master-server.patch
index 2fb9b81..c5d8f40 100644
--- a/debian/patches/0021-Use-the-OpenArena-master-server.patch
+++ b/debian/patches/0021-Use-the-OpenArena-master-server.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:19:40 +0100
 Subject: [PATCH] Use the OpenArena master server
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/qcommon.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0022-Set-an-empty-authorize-server.patch b/debian/patches/0022-Set-an-empty-authorize-server.patch
index 82e174b..6f50b98 100644
--- a/debian/patches/0022-Set-an-empty-authorize-server.patch
+++ b/debian/patches/0022-Set-an-empty-authorize-server.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:20:50 +0100
 Subject: [PATCH] Set an empty authorize server
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/qcommon/qcommon.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0023-Add-light-bloom-postprocessing.patch b/debian/patches/0023-Add-light-bloom-postprocessing.patch
index e42a4c6..beb3373 100644
--- a/debian/patches/0023-Add-light-bloom-postprocessing.patch
+++ b/debian/patches/0023-Add-light-bloom-postprocessing.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:21:58 +0100
 Subject: [PATCH] Add light-bloom postprocessing
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/Makefile                   |    1 +
  engine/code/renderer/tr_backend.c |    9 +
diff --git a/debian/patches/0025-Never-talk-to-an-authorize-server-even-if-not-standa.patch b/debian/patches/0025-Never-talk-to-an-authorize-server-even-if-not-standa.patch
index 43e430b..9c297bb 100644
--- a/debian/patches/0025-Never-talk-to-an-authorize-server-even-if-not-standa.patch
+++ b/debian/patches/0025-Never-talk-to-an-authorize-server-even-if-not-standa.patch
@@ -1,10 +1,10 @@
-From: Simon McVittie <smcv at debian.org>
+From: sago007 <unknown>
 Date: Thu, 29 Jul 2010 02:22:49 +0100
 Subject: [PATCH] Never talk to an authorize server, even if not standalone (?)
 
 Imported from OpenArena engine tarball 0.8.x-13.
 
-Origin: upstream
+Origin: upstream, openarena
 ---
  engine/code/server/sv_client.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

-- 
Packaging for the OpenArena engine

More information about the Pkg-games-commits mailing list