[SCM] Quake 3 engine branch, debian-experimental, updated. debian/1.36+svn2287-1-3-g2fa67cc

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 7120806621dcaa5d6ae1549433473b41b10e244f
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 4 18:01:11 2012 +0100

    Compile on Hurd, treating it like Linux and kFreeBSD (patch and testing by Svante Signell, closes: #679330)

diff --git a/debian/changelog b/debian/changelog
index ee5a41c..4db93f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ioquake3 (1.36+svn2287-2) UNRELEASED; urgency=low
+
+  * Compile on Hurd, treating it like Linux and kFreeBSD (patch and testing
+    by Svante Signell, closes: #679330)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 04 Jul 2012 17:50:01 +0100
+
 ioquake3 (1.36+svn2287-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 0b33ae8..7faa02c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/ioquake3.git;a=summary
 Homepage: http://www.ioquake3.org/
 
 Package: ioquake3
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any kfreebsd-any hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: x11-utils | zenity | kdebase-bin
 Breaks: openarena (<< 0.8.5-10~)
@@ -32,7 +32,7 @@ Description: Game engine for 3D first person shooter games
  openarena or another suitable set of game data.
 
 Package: ioquake3-server
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any kfreebsd-any hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Standalone server for ioQuake3 based games
  This package installs a modified version of the ioQuake3 dedicated server,
@@ -43,7 +43,7 @@ Description: Standalone server for ioQuake3 based games
  openarena-server or another suitable set of server data.
 
 Package: ioquake3-dbg
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any kfreebsd-any hurd-any
 Section: debug
 Priority: extra
 Depends: ioquake3 (= ${binary:Version}) | ioquake3-server (= ${binary:Version}),
diff --git a/debian/patches/ioquake3_hurd_support.patch b/debian/patches/ioquake3_hurd_support.patch
new file mode 100644
index 0000000..8d16c88
--- /dev/null
+++ b/debian/patches/ioquake3_hurd_support.patch
@@ -0,0 +1,38 @@
+From: Svante Signell <svante.signell at telia.com>
+Subject: Add support for the GNU/Hurd architecture
+
+Origin: vendor, Debian
+Bug-Debian: http://bugs.debian.org/679330
+
+--- a/Makefile	2012-06-26 13:33:50.000000000 +0200
++++ b/Makefile	2012-06-29 16:59:19.000000000 +0200
+@@ -291,7 +291,7 @@
+ INSTALL=install
+ MKDIR=mkdir
+ 
+-ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
++ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
+ 
+   ifeq ($(ARCH),axp)
+     ARCH=alpha
+--- a/code/qcommon/q_platform.h	2011-10-22 00:48:53.000000000 +0200
++++ b/code/qcommon/q_platform.h	2012-06-26 20:44:59.000000000 +0200
+@@ -169,14 +169,16 @@
+ 
+ //================================================================= LINUX ===
+ 
+-#if defined(__linux__) || defined(__FreeBSD_kernel__)
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ 
+ #include <endian.h>
+ 
+ #if defined(__linux__)
+ #define OS_STRING "linux"
+-#else
++#elif defined(__FreeBSD_kernel__)
+ #define OS_STRING "kFreeBSD"
++#else
++#define OS_STRING "GNU"
+ #endif
+ 
+ #ifdef __clang__
diff --git a/debian/patches/series b/debian/patches/series
index 57083f4..db4b492 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-Let-servers-set-sv_fps-too.patch
 0008-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
 0009-Run-in-a-window-by-default-on-new-installations.patch
+ioquake3_hurd_support.patch

-- 
Quake 3 engine