[pkg-ggz-commits] r136 - ggz-server/trunk/debian

Peter Eisentraut petere at costa.debian.org
Wed Oct 11 00:42:03 UTC 2006


Author: petere
Date: 2006-10-11 00:42:02 +0000 (Wed, 11 Oct 2006)
New Revision: 136

Removed:
   ggz-server/trunk/debian/ggzd.postinst
Modified:
   ggz-server/trunk/debian/changelog
   ggz-server/trunk/debian/control
   ggz-server/trunk/debian/ggzd.init
   ggz-server/trunk/debian/ggzd.install
   ggz-server/trunk/debian/ggzd.postrm
   ggz-server/trunk/debian/rules
Log:
* Set build dependency to libdb4.4-dev only
* Improved init script with LSB header and output functions
* Set localstatedir to /var/lib so data ends up in /var/lib/ggzd
* Create /var/lib/ggzd in the package

Modified: ggz-server/trunk/debian/changelog
===================================================================
--- ggz-server/trunk/debian/changelog	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/changelog	2006-10-11 00:42:02 UTC (rev 136)
@@ -1,9 +1,12 @@
 ggz-server (0.0.13-3) UNRELEASED; urgency=low
 
   * Fixed package dependencies for binNMU compatibility
-  * Set build dependency to libdb4.3-dev only
+  * Set build dependency to libdb4.4-dev only
+  * Improved init script with LSB header and output functions
+  * Set localstatedir to /var/lib so data ends up in /var/lib/ggzd
+  * Create /var/lib/ggzd in the package
 
- -- Peter Eisentraut <petere at debian.org>  Tue, 10 Oct 2006 23:38:44 +0200
+ -- Peter Eisentraut <petere at debian.org>  Wed, 11 Oct 2006 01:09:40 +0200
 
 ggz-server (0.0.13-2) unstable; urgency=low
 

Modified: ggz-server/trunk/debian/control
===================================================================
--- ggz-server/trunk/debian/control	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/control	2006-10-11 00:42:02 UTC (rev 136)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.13), libexpat1-dev (>= 1.95.6), libdb4.3-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.13), libexpat1-dev (>= 1.95.6), libdb4.4-dev, lsb-base (>= 3.0-3)
 
 Package: ggzd
 Architecture: any

Modified: ggz-server/trunk/debian/ggzd.init
===================================================================
--- ggz-server/trunk/debian/ggzd.init	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/ggzd.init	2006-10-11 00:42:02 UTC (rev 136)
@@ -1,61 +1,60 @@
 #! /bin/sh
-#
-# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian GNU/Linux by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-# Modified for ggzd by Stephen Zander <gibreel at debian.org>
 
-set -e
+### BEGIN INIT INFO
+# Provides:          ggzd
+# Required-Start:    $local_fs $network $remote_fs
+# Required-Stop:     $local_fs $network $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start GGZ server
+### END INIT INFO
 
-DAEMON=/usr/sbin/ggzd
-NAME=ggzd
-DESC="GGZ Gaming Zone Main Server"
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
 
-case "$1" in
-    start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --chuid games \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop \
-		--oknodo --exec $DAEMON
-	echo "$NAME."
-	;;
-    #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-	#;;
-    restart|force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart".
-	#
-	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop \
-		--oknodo --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}"
-	exit 1
-	;;
-esac
+DAEMON=/usr/sbin/ggzd
+PIDFILE=/var/lib/ggzd/ggzd.pid
 
-exit 0
+test -x $DAEMON || exit 5
 
+case $1 in
+	start)
+		log_daemon_msg "Starting GGZ server" "ggzd"
+		start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --chuid games --startas $DAEMON
+		log_end_msg $?
+		;;
+	stop)
+		log_daemon_msg "Stopping GGZ server" "ggzd"
+		start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+		log_end_msg $?
+		rm -f $PIDFILE
+		;;
+	restart|force-reload)
+		$0 stop && sleep 1 && $0 start
+		;;
+	try-restart)
+		if $0 status >/dev/null; then
+			$0 restart
+		else
+			exit 0
+		fi
+		;;
+	reload)
+		exit 3
+		;;
+	status)
+		pidofproc -p $PIDFILE $DAEMON >/dev/null
+		status=$?
+		if [ $status -eq 0 ]; then
+			log_success_msg "GGZ server is running."
+		else
+			log_failure_msg "GGZ server is not running."
+		fi
+		exit $status
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
+		exit 2
+		;;
+esac

Modified: ggz-server/trunk/debian/ggzd.install
===================================================================
--- ggz-server/trunk/debian/ggzd.install	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/ggzd.install	2006-10-11 00:42:02 UTC (rev 136)
@@ -1,4 +1,5 @@
 debian/tmp/etc/ggzd/ggzd.*
+debian/tmp/etc/ggzd/rooms/entry.room
 debian/tmp/usr/bin/ggzduedit
 debian/tmp/usr/share/man/man6
 debian/tmp/usr/bin/ggzd usr/sbin

Deleted: ggz-server/trunk/debian/ggzd.postinst
===================================================================
--- ggz-server/trunk/debian/ggzd.postinst	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/ggzd.postinst	2006-10-11 00:42:02 UTC (rev 136)
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-var=/var/lib/ggzd
-
-case "$1" in
-configure)
-    test -d $var || mkdir $var
-    chown -R games.games $var
-    chmod 755 $var
-    ;;
-
-esac
-
-#DEBHELPER#

Modified: ggz-server/trunk/debian/ggzd.postrm
===================================================================
--- ggz-server/trunk/debian/ggzd.postrm	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/ggzd.postrm	2006-10-11 00:42:02 UTC (rev 136)
@@ -1,12 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
 
-var=/var/lib/ggzd
+set -e
 
-case "$1" in
-purge)
-    rm -rf $var
-    ;;
+if [ "$1" = purge ]; then
+    rm -rf /var/lib/ggzd
+fi
 
-esac
-
 #DEBHELPER#

Modified: ggz-server/trunk/debian/rules
===================================================================
--- ggz-server/trunk/debian/rules	2006-10-10 21:39:18 UTC (rev 135)
+++ ggz-server/trunk/debian/rules	2006-10-11 00:42:02 UTC (rev 136)
@@ -3,10 +3,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug
+DEB_CONFIGURE_EXTRA_FLAGS = --localstatedir=/var/lib --disable-debug
 DEB_DH_MAKESHLIBS_ARGS_ALL = -V
 DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib
 
-common-install-impl::
-	mkdir -p debian/ggzd/etc/ggzd/rooms
-	mv debian/tmp/etc/ggzd/rooms/entry.room debian/ggzd/etc/ggzd/rooms
+DEB_FIXPERMS_EXCLUDE = /var/lib/ggzd
+
+install/ggzd::
+	install -d -o games -g games debian/ggzd/var/lib/ggzd




More information about the pkg-ggz-commits mailing list