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

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 22d8ab4bdea211fecb4db251d39724aba006f777
Merge: 85fa0e66584dda1f6d865891d56a579ae8acd8d7 d5cae6c5711a1d344efdbcfc1221224e244c36be
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Sep 14 10:26:24 2012 +0100

    Merge branch 'master' into debian-experimental

diff --combined debian/changelog
index b390978,af1cdf5..7c84903
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
 -openarena (0.8.8-5+deb7u1) unstable; urgency=low
++openarena (0.8.8-7) UNRELEASED; urgency=low
+ 
 -  * Add patch from upstream to fix a client-triggerable server crash.
 -    Thanks to Poul Sander and Markus Koschany (Closes: #681812)
++  * Merge from 0.8.8-5+deb7u1
++    - Add patch from upstream to fix a client-triggerable server crash.
++      Thanks to Poul Sander and Markus Koschany (Closes: #681812)
+ 
+  -- Simon McVittie <smcv at debian.org>  Fri, 14 Sep 2012 07:52:53 +0100
+ 
 +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 --combined debian/patches/series
index d65e39c,40c06f5..0d39039
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,4 +1,5 @@@
  0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
+ 0002-Fix-callvote-kick-player-does-not-exist-crash.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