[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 6d6afe26f7142763e1763c4cf4ccecc7b95858fa
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 21:47:31 2010 +0100

    Amend FreeBSD compatibility patch to apply to game/ too

diff --git a/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
index 539e905..27939c9 100644
--- a/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
+++ b/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
@@ -2,14 +2,18 @@ From: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
 Date: Sun, 18 Jul 2010 00:00:40 +0100
 Subject: [PATCH] Fix FTBFS on kFreeBSD
 
+It's close enough to Linux for our purposes that we'll just pretend
+it's Linux.
+
 Bug-Debian: http://bugs.debian.org/413617
 ---
  engine/Makefile                  |    4 ++--
  engine/code/qcommon/q_platform.h |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ game/code/qcommon/q_platform.h   |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/engine/Makefile b/engine/Makefile
-index 0fad630..1926e04 100644
+index 6cb0d41..eee4c96 100644
 --- a/engine/Makefile
 +++ b/engine/Makefile
 @@ -4,7 +4,7 @@
@@ -43,4 +47,17 @@ index 1152fdf..310ec32 100644
  
  #include <endian.h>
  
+diff --git a/game/code/qcommon/q_platform.h b/game/code/qcommon/q_platform.h
+index 1152fdf..310ec32 100644
+--- a/game/code/qcommon/q_platform.h
++++ b/game/code/qcommon/q_platform.h
+@@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+ //================================================================= LINUX ===
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD_kernel__)
+ 
+ #include <endian.h>
+ 
 -- 

-- 
Packaging for the OpenArena engine