[SCM] Packaging for quakespasm branch, master, updated. debian/0.85.4-1-1-g62b170f

[Simon McVittie]

The following commit has been merged in the master branch:
commit 62b170fd419fcae0d23d1f96546e538417f43e5f
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jul 19 11:45:53 2011 +0100

    debian/patches/gnu.patch: add "gnu" as an OS type, so compilation can at least be attempted on Hurd and kFreeBSD

diff --git a/debian/changelog b/debian/changelog
index 05bc41c..7beda95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quakespasm (0.85.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/gnu.patch: add "gnu" as an OS type, so compilation can at
+    least be attempted on Hurd and kFreeBSD
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 19 Jul 2011 10:57:06 +0100
+
 quakespasm (0.85.4-1) unstable; urgency=low
 
   [ David Banks ]
diff --git a/debian/patches/gnu.patch b/debian/patches/gnu.patch
new file mode 100644
index 0000000..533a6cc
--- /dev/null
+++ b/debian/patches/gnu.patch
@@ -0,0 +1,34 @@
+From 8d09c0cf08e0ec797b906b3ce671c9722fde4e59 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at debian.org>
+Date: Tue, 19 Jul 2011 10:55:30 +0100
+Subject: [PATCH] Allow compilation to be at least attempted on Hurd and
+ kFreeBSD
+
+Origin: vendor, Debian
+---
+ quakespasm/Quake/Makefile |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/quakespasm/Quake/Makefile b/quakespasm/Quake/Makefile
+index c58a37a..f6a983e 100644
+--- a/quakespasm/Quake/Makefile
++++ b/quakespasm/Quake/Makefile
+@@ -51,10 +51,18 @@ HOST_OS = UNIX
+ UNIX = linux
+ TOPDIR := $(shell pwd)
+ else
++ifneq (,$(filter GNU GNU/%,$(SYSNAME)))
++# This covers the GNU OS (GNU/Hurd) and Debian GNU/kFreeBSD, which use glibc
++# on a non-Linux kernel - Quake is mostly interested in the libc anyway
++HOST_OS = UNIX
++UNIX = gnu
++TOPDIR := $(shell pwd)
++else
+ $(error OS type not detected.)
+ endif
+ endif
+ endif
++endif
+ 
+ # ---------------------------------------
+ # Define some build variables
diff --git a/debian/patches/series b/debian/patches/series
index 169c09d..a084391 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-redundant-linking.patch
 support-user-directories.patch
 history-in-dotfile.patch
 mp3-copyright.patch
+gnu.patch

-- 
Packaging for quakespasm