[SCM] [contrib] Quake III: Arena launcher branch, master, updated. debian/1.2-9-g633318b

[Simon McVittie]

The following commit has been merged in the master branch:
commit 86946436e606b366af12999cf1071559c22cf61e
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jun 23 00:35:10 2012 +0100

    Add status action to init script

diff --git a/debian/changelog b/debian/changelog
index 2ff0271..0e2cb4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quake3 (1.4) UNRELEASED; urgency=low
+
+  * Add status action to init script
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 23 Jun 2012 00:34:40 +0100
+
 quake3 (1.3) unstable; urgency=low
 
   * Make the desktop file definitely run /usr/games/quake3, and not some
diff --git a/debian/quake3-server.init b/debian/quake3-server.init
index 7ba059d..6afbd70 100644
--- a/debian/quake3-server.init
+++ b/debian/quake3-server.init
@@ -80,9 +80,10 @@ case "$1" in
         q3_stop && sleep 1 && q3_start
         log_end_msg $?
 	;;
+    status)
+        status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
     *)
-	# echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
 	exit 1
 	;;
 esac

-- 
[contrib] Quake III: Arena launcher