[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 1f58b8f26671f11e58c4694f87287a9cbf975080
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 22:01:27 2010 +0100

    Put a #error marker in engine's ui_shared.h to make sure it's not needed

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
new file mode 100644
index 0000000..2a079e9
--- /dev/null
+++ b/debian/patches/0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
@@ -0,0 +1,21 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 28 Jul 2010 22:00:31 +0100
+Subject: [PATCH] Put a #error marker in engine's ui_shared.h to make sure it's not needed
+
+Its data structures differ from the one in the OA game logic, but it turns
+out not to be used in the engine anyway.
+---
+ engine/code/ui/ui_shared.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/engine/code/ui/ui_shared.h b/engine/code/ui/ui_shared.h
+index 5ab438b..d97fe0d 100644
+--- a/engine/code/ui/ui_shared.h
++++ b/engine/code/ui/ui_shared.h
+@@ -1,3 +1,5 @@
++#error This is not used in the engine. If it becomes used, check whether
++#error changes from the game code need to be applied, then remove this notice.
+ /*
+ ===========================================================================
+ Copyright (C) 1999-2005 Id Software, Inc.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index cec115e..544d56f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
 0010-Sys_LoadDll-use-FS_FindDll.patch
 0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
+0012-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch

-- 
Packaging for the OpenArena engine