[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.8-2-8-g6b45a40

[Simon McVittie]

The following commit has been merged in the master branch:
commit 65a9e096397a4a5b9171b660d6e04cc987faf1f5
Author: Simon McVittie <smcv at debian.org>
Date:   Sun May 20 18:26:39 2012 +0100

    When we upgraded from before 0.8.8, actually avoid running the server as intended (thanks to Stepan Golosunov for the patch; closes: #673128)

diff --git a/debian/changelog b/debian/changelog
index bebe859..13b918a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-openarena (0.8.8-4) UNRELEASED; urgency=low
+openarena (0.8.8-4) unstable; urgency=high
 
   [ Fabian Greffrath ]
   * Include details of ioquake3 (or ioquake3-server) in openarena (or
     openarena-server) bug reports
 
+  [ Simon McVittie ]
+  * When we upgraded from before 0.8.8, actually avoid running the server
+    as intended (thanks to Stepan Golosunov for the patch; closes: #673128)
+
  -- Simon McVittie <smcv at debian.org>  Mon, 16 Apr 2012 12:18:38 +0100
 
 openarena (0.8.8-3) unstable; urgency=low
diff --git a/debian/openarena-server.init b/debian/openarena-server.init
index ef4e03e..b5d3221 100644
--- a/debian/openarena-server.init
+++ b/debian/openarena-server.init
@@ -34,6 +34,7 @@ q3_start() {
     if [ "$START_DAEMON" = "unless-disabled-by-upgrade" ]; then
         if [ -e /var/games/openarena-server/init-script-disabled-by-upgrade ]; then
             echo -n " (disabled during upgrade, not starting - see /usr/share/doc/openarena-server/NEWS.Debian.gz)"
+	    return 0
         fi
     elif [ "$START_DAEMON" != 1 ]; then
         echo -n " (disabled in /etc/default/openarena-server - deprecated, see /usr/share/doc/openarena-server/README.Debian.gz)"

-- 
Packaging for the OpenArena engine