[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-3-4-gf84d6dd

[Simon McVittie]

The following commit has been merged in the master branch:
commit cfa7a19344daf562ff8658c4c10789be4c61ef9c
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 22 20:10:44 2010 +0100

    Improve patch tagging on the last couple of patches

diff --git a/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch b/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
index bb6bd15..56f590f 100644
--- a/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
+++ b/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
@@ -6,7 +6,15 @@ Subject: [PATCH] Add OPENARENA_081_COMPATIBLE define for network compat with 0.8
 0.8.1 was approximately compatible with Quake III Arena, whereas 0.8.5
 is more like Team Arena. Unfortunately, these are not the same.
 
+Not forwarded: upstream expect everyone to use the precompiled bytecode they
+supply, which was built from unmodified 0.8.5 and 0.8.1 source code. We're not
+doing that in Debian for DFSG reasons, and I'd rather not add a second complete
+copy of the source.
+
+Origin: vendor, Debian
 Bug: http://openarena.ws/board/index.php?topic=3717.0
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592965
+Forwarded: no
 ---
  game/Makefile              |    4 ++++
  game/code/cgame/cg_draw.c  |    6 +++---
diff --git a/debian/patches/0041-If-a-QVM-starts-with-NTVE-followed-by-a-nonempty-str.patch b/debian/patches/0041-If-a-QVM-starts-with-NTVE-followed-by-a-nonempty-str.patch
index 66ce0bb..8aee1d4 100644
--- a/debian/patches/0041-If-a-QVM-starts-with-NTVE-followed-by-a-nonempty-str.patch
+++ b/debian/patches/0041-If-a-QVM-starts-with-NTVE-followed-by-a-nonempty-str.patch
@@ -6,6 +6,10 @@ Subject: [PATCH] If a QVM starts with NTVE followed by a nonempty string, look i
 This lets each version have a different substitute shared object, if
 necessary for network compatibility (OpenArena broke network
 compatibility between 0.8.1 and 0.8.5 by removing some #ifdef MISSIONPACK).
+
+Origin: vendor, Debian
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592965
+Forwarded: no (amends an earlier patch which hasn't been forwarded yet)
 ---
  engine/code/qcommon/vm.c |   20 ++++++++++++++++++++
  1 files changed, 20 insertions(+), 0 deletions(-)

-- 
Packaging for the OpenArena engine