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

[Simon McVittie]

The following commit has been merged in the master branch:
commit 0897d491f318aa1d8efd57677d35610028310008
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 22:12:49 2010 +0100

    Note some patches that don't need forwarding

diff --git a/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch b/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
index 2346264..77a8eff 100644
--- a/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
+++ b/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
@@ -2,7 +2,11 @@ From: Guillaume Delacour <unknown>
 Date: Sun, 18 Jul 2010 00:00:18 +0100
 Subject: [PATCH] Fix segfault when deleting non-existent ban address 0
 
+In ioquake3, this was fixed in passing by r1557; OpenArena 0.8.5 uses a
+newer engine than r1557.
+
 Bug-Debian: http://bugs.debian.org/532212
+Forwarded: not-needed
 ---
  engine/code/server/sv_ccmds.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch b/debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
index 7d496da..b3c8238 100644
--- a/debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
+++ b/debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
@@ -4,6 +4,10 @@ Subject: [PATCH] Add #error markers to sources in the mod SDK that are not used
 
 If we're not compiling them, we don't need to check that they're up to
 date, and #error is a good way to make sure!
+
+Not useful or appropriate for upstream.
+
+Forwarded: not-needed
 ---
  game/code/botlib/aasfile.h              |    3 +++
  game/code/botlib/be_aas_bsp.h           |    3 +++
diff --git a/debian/patches/0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch b/debian/patches/0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
index 2a079e9..4a017ad 100644
--- a/debian/patches/0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
+++ b/debian/patches/0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
@@ -4,6 +4,10 @@ Subject: [PATCH] Put a #error marker in engine's ui_shared.h to make sure it's n
 
 Its data structures differ from the one in the OA game logic, but it turns
 out not to be used in the engine anyway.
+
+Not useful or appropriate for upstream.
+
+Forwarded: not-needed
 ---
  engine/code/ui/ui_shared.h |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)

-- 
Packaging for the OpenArena engine