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

[David Banks]

The following commit has been merged in the master branch:
commit ce5b1bf191c06bbe25771aa5a4072f03593b4942
Author: David Banks <amoebae at gmail.com>
Date:   Tue Mar 20 08:04:46 2012 +0000

    drop patch kfreebsd-sockaddr-length.patch

diff --git a/debian/changelog b/debian/changelog
index 4a58895..7a8c4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ quakespasm (0.85.7-1) unstable; urgency=low
 
   * New upstream release.
   * Refresh support-user-directories.patch and gnu.patch.
+  * Drop kfreebsd-sockaddr-length.patch, fixed upstream.
 
  -- David Banks <amoebae at gmail.com>  Tue, 20 Mar 2012 07:50:55 +0000
 
diff --git a/debian/patches/kfreebsd-sockaddr-length.patch b/debian/patches/kfreebsd-sockaddr-length.patch
deleted file mode 100644
index fcb4a0e..0000000
--- a/debian/patches/kfreebsd-sockaddr-length.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 8391467..eaef0fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ remove-redundant-linking.patch
 support-user-directories.patch
 mp3-copyright.patch
 gnu.patch
-kfreebsd-sockaddr-length.patch

-- 
Packaging for quakespasm