[SCM] Packaging for the OpenArena engine branch, debian-experimental, updated. debian/0.8.8-5-1-g85fa0e6

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 85fa0e66584dda1f6d865891d56a579ae8acd8d7
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 5 08:59:47 2012 +0100

    Compile on Hurd (patch and testing by Svante Signell, related to #679330)

diff --git a/debian/changelog b/debian/changelog
index 58ad24a..b390978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openarena (0.8.8-6) experimental; urgency=low
+
+  * Switch gbp.conf to experimental branch
+  * Compile on Hurd (patch and testing by Svante Signell, related to
+    #679330)
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 05 Jul 2012 08:57:58 +0100
+
 openarena (0.8.8-5) unstable; urgency=low
 
   * Don't refuse to start a new openarena-server if there's a stale
diff --git a/debian/control b/debian/control
index eba0c64..3e3fe0a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/openarena.git;a=summary
 Homepage: http://openarena.ws/
 
 Package: openarena
-Architecture: any
+Architecture: linux-any kfreebsd-any hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends},
          ioquake3 (>= 1.36+svn2224-3~),
          openarena-081-maps,
@@ -38,7 +38,7 @@ Description: fast-paced 3D first-person shooter
  This package installs the OpenArena client.
 
 Package: openarena-server
-Architecture: any
+Architecture: linux-any kfreebsd-any hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends},
          adduser,
          ioquake3-server (>= 1.36+svn2224-3~),
@@ -61,7 +61,7 @@ Description: server and game logic for the game OpenArena
 Package: openarena-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any kfreebsd-any hurd-any
 Depends: openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
          ${misc:Depends}
 Recommends: ioquake3-dbg
diff --git a/debian/gbp.conf b/debian/gbp.conf
index efba884..6dcefa3 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
+debian-branch = debian-experimental
+upstream-branch = upstream-experimental
 pristine-tar = True
diff --git a/debian/patches/openarena_hurd_support.patch b/debian/patches/openarena_hurd_support.patch
new file mode 100644
index 0000000..107d087
--- /dev/null
+++ b/debian/patches/openarena_hurd_support.patch
@@ -0,0 +1,26 @@
+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
+
+--- openarena-0.8.8/code/qcommon/q_platform.h	2012-06-29 16:56:11.000000000 +0200
++++ openarena-0.8.8.new/code/qcommon/q_platform.h	2012-06-28 19:21:44.000000000 +0200
+@@ -147,7 +147,7 @@
+ 
+ //================================================================= LINUX ===
+ 
+-#if defined(__linux__) || defined(__FreeBSD_kernel__)
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ 
+ #include <endian.h>
+ 
+@@ -210,6 +210,8 @@
+ #define OS_STRING "freebsd"
+ #elif defined(__OpenBSD__)
+ #define OS_STRING "openbsd"
++#elif defined(__GNU__)
++#define OS_STRING "GNU"
+ #elif defined(__NetBSD__)
+ #define OS_STRING "netbsd"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 8af2664..d65e39c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
 0031-Fix-FTBFS-on-kFreeBSD.patch
 0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
+openarena_hurd_support.patch

-- 
Packaging for the OpenArena engine