[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-33-g855d6ce

[Simon McVittie]

The following commit has been merged in the debian branch:
commit caa37cd2deac1d553ff2d633899b2760a7dfc358
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 10:51:55 2010 +0100

    Disable the tremulous-server init script by default - enable it in /etc/default/tremulous-server if you want a system-wide instance

diff --git a/debian/changelog b/debian/changelog
index 8811d67..8409dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
     falling back to the architecture-neutral QVM interpreter
   * Improve the tremulous-server init script so it stops the process correctly
     (partially addresses #469576)
+  * Disable the tremulous-server init script by default - enable it in
+    /etc/default/tremulous-server if you want a system-wide instance
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/tremulous-server.default b/debian/tremulous-server.default
index 3b9f9fe..8f58fd0 100644
--- a/debian/tremulous-server.default
+++ b/debian/tremulous-server.default
@@ -2,6 +2,9 @@
 # sourced by /etc/init.d/tremulous-server
 # installed at /etc/default/tremulous-server by the maintainer scripts
 
+# set to 1 to enable
+START_DAEMON=0
+
 # DNS name or IP address of your internet interface. Change it if you're setting up an internet server.
 NET_IP="localhost"
 
diff --git a/debian/tremulous-server.init b/debian/tremulous-server.init
index cc6e31d..d9ebf21 100644
--- a/debian/tremulous-server.init
+++ b/debian/tremulous-server.init
@@ -30,6 +30,10 @@ tremulous_start() {
     if [ -f $PIDFILE ]; then
         return 2
     fi
+    if [ "$START_DAEMON" != 1 ]; then
+        echo "not starting - disabled in /etc/default/tremulous-server"
+        return 0
+    fi
     start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
 	--background --exec $BINARY --startas $DAEMON \
 	--make-pidfile --chuid nobody \

-- 
team based FPS game - packaging