[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 e42676d5b7737378aef41137cfefd1f9aea3f76e
Author: Luca Capello <luca at pca.it>
Date:   Fri May 29 00:16:22 2009 +0200

    debian/fso-gpsd.init: use PIDDIR and PIDFILE variables

diff --git a/debian/changelog b/debian/changelog
index 08a122f..d21d299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ fso-gpsd (0.8-3) UNRELEASED; urgency=low
     + add frameworkd to LSB Required-Start:/-Stop: dependencies.
     + move `set -e` at the beginning.
     + better value for DESC variable.
+    + use PIDDIR and PIDFILE variables.
     + 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).
diff --git a/debian/fso-gpsd.init b/debian/fso-gpsd.init
index 2318b06..cd20813 100644
--- a/debian/fso-gpsd.init
+++ b/debian/fso-gpsd.init
@@ -24,7 +24,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/fso-gpsd
 NAME=fso-gpsd
 DESC="freesmartphone.org GPSD compatibility daemon"
-DAEMON_OPTS="-S localhost:gpsd -P /var/run/$NAME.pid"
+PIDDIR=/var/run/
+PIDFILE=${PIDDIR}/${NAME}.pid
+DAEMON_OPTS="-S localhost:gpsd -P $PIDFILE"
 
 
 # Gracefully exit if the package has been removed (but not purged).
@@ -34,13 +36,13 @@ DAEMON_OPTS="-S localhost:gpsd -P /var/run/$NAME.pid"
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-	start-stop-daemon --oknodo --start --quiet --pidfile /var/run/$NAME.pid \
+	start-stop-daemon --oknodo --start --quiet --pidfile ${PIDFILE} \
 		--exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
+	start-stop-daemon --oknodo --stop --quiet --pidfile ${PIDFILE}
 	echo "$NAME."
 	;;
   restart|force-reload)

-- 
gpsd for fso