[pkg-fso-commits] [SCM] gpsd for fso branch, debian, updated. debian/0.8-2-20-gf2387cf

[Luca Capello]

The following commit has been merged in the debian branch:
commit 7cb4636cc7d1daef76688ae1af19268835956ae8
Author: Luca Capello <luca at pca.it>
Date:   Thu May 28 23:39:41 2009 +0200

    debian/fso-gpsd.init: simplify restart/force-reload case

diff --git a/debian/changelog b/debian/changelog
index 3e910f8..7101e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ fso-gpsd (0.8-3) UNRELEASED; urgency=low
     + use test brackets to check if the package has been removed
       but not purged (and add a useful comment).
     + add --oknodo to start case (Standards-Version 3.8.1).
+    + simplify restart/force-reload case.
   * debian/rules:
     + generate the manpage, thanks to lintian (this unfortunately
       required a more verbose rules file).
diff --git a/debian/fso-gpsd.init b/debian/fso-gpsd.init
index b2acd17..f133c0f 100644
--- a/debian/fso-gpsd.init
+++ b/debian/fso-gpsd.init
@@ -43,37 +43,9 @@ case "$1" in
 	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
 	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
-  #;;
-  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" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid \
-	&& $0 restart \
-	|| exit 0
-	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+  restart|force-reload)
+        $0 stop
+        $0 start
 	;;
   *)
 	N=/etc/init.d/$NAME

-- 
gpsd for fso