[SCM] Packaging for quakespasm branch, master, updated. debian/0.85.6-1-1-g7d831ee

[David Banks]

The following commit has been merged in the master branch:
commit 7d831ee5612e6f6dc1096d1d6447c1c3cc48f38a
Author: David Banks <amoebae at gmail.com>
Date:   Tue Feb 28 13:06:14 2012 +0000

    fix #657793: FTBFS on kfreebsd-*

diff --git a/debian/changelog b/debian/changelog
index 416fdf5..182d82b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quakespasm (0.85.6-2) unstable; urgency=low
+
+  * Fix FTBFS on kFreeBSD due to different socket struct length.
+    (Closes: #657793)
+
+ -- David Banks <amoebae at gmail.com>  Tue, 28 Feb 2012 13:01:19 +0000
+
 quakespasm (0.85.6-1) unstable; urgency=low
 
   [ Stephen Kitt ]
diff --git a/debian/patches/kfreebsd-sockaddr-length.patch b/debian/patches/kfreebsd-sockaddr-length.patch
new file mode 100644
index 0000000..fcb4a0e
--- /dev/null
+++ b/debian/patches/kfreebsd-sockaddr-length.patch
@@ -0,0 +1,17 @@
+Description: Fix socket type length for kFreeBSD
+ Code already existed to special case the sockaddr type for FreeBSD vanilla, but
+ needed to be extended to depend on the definition of __FreeBSD_kernel__ for
+ kFreeBSD.
+Bug-Debian: http://bugs.debian.org/657793
+From: Steven Chamberlain <steven at pyro.eu.org>
+--- a/Quake/net_sys.h
++++ b/Quake/net_sys.h
+@@ -62,7 +62,7 @@
+ 
+ #if defined(__FreeBSD__) || defined(__DragonFly__)	|| \
+     defined(__OpenBSD__) || defined(__NetBSD__)		|| \
+-    defined(__MACOSX__)
++    defined(__MACOSX__) || defined(__FreeBSD_kernel__)
+ /* struct sockaddr has unsigned char sa_len as the first member in BSD
+  * variants and the family member is also an unsigned char instead of an
+  * unsigned short. This should matter only when PLATFORM_UNIX is defined,
diff --git a/debian/patches/series b/debian/patches/series
index eaef0fe..8391467 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-redundant-linking.patch
 support-user-directories.patch
 mp3-copyright.patch
 gnu.patch
+kfreebsd-sockaddr-length.patch

-- 
Packaging for quakespasm