[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 33d28d4cd92f87e0dcfd7ab32cb389407c7055cf
Author: David Banks <amoebae at gmail.com>
Date:   Tue Mar 20 09:03:03 2012 +0000

    merge changelogs from unreleased debian version of previous stable

diff --git a/debian/changelog b/debian/changelog
index b96c7c9..4f80bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,13 @@
 quakespasm (0.85.7-1) unstable; urgency=low
 
   * New upstream release.
+  * Update to latest policy and DEP-5 version.
   * Refresh support-user-directories.patch and gnu.patch.
   * Drop kfreebsd-sockaddr-length.patch, fixed upstream.
   * Refresh upstream changelog.
 
  -- David Banks <amoebae at gmail.com>  Tue, 20 Mar 2012 07:50:55 +0000
 
-quakespasm (0.85.6-2) unstable; urgency=low
-
-  * Fix FTBFS on kFreeBSD due to different socket struct length.
-    (Closes: #657793)
-  * Update to latest policy and DEP-5 version.
-
- -- David Banks <amoebae at gmail.com>  Tue, 28 Feb 2012 13:01:19 +0000
-
 quakespasm (0.85.6-1) unstable; urgency=low
 
   [ Stephen Kitt ]

-- 
Packaging for quakespasm