[Pkg-voip-commits] [stun] 02/03: Imported Debian patch 0.96.dfsg-6

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository stun.

commit 1b1d83080ca8b392d2f5f698164298a07beb5cba
Author: Kilian Krause <kilian at debian.org>
Date:   Tue May 24 13:49:32 2011 +0200

    Imported Debian patch 0.96.dfsg-6
---
 debian/changelog | 15 ++++++++++++++-
 debian/control   |  7 +++----
 debian/init.d    | 31 ++++++++++++++++++++++++-------
 debian/watch     |  3 +++
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c1f2b6..6841f9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+stun (0.96.dfsg-6) unstable; urgency=low
+
+  [ Kilian Krause ]
+  * Add Homepage field as added in dpkg-dev 1.14.6. (Closes: #620342, #615190)
+  * Fixed debian/watch file.
+  * Add status option to init file (Closes: #493970)
+
+  [ Patrick Matthäi ]
+  * Fixed spelling error in debian/changelog: s/standart/standard/.
+    Thanks lintian.
+
+ -- Kilian Krause <kilian at debian.org>  Tue, 24 May 2011 13:49:32 +0200
+
 stun (0.96.dfsg-5) unstable; urgency=low
 
   * added manpage for stun and stund (Closes: #425827)
   * update init.d to complain with LSB
-  * Bumped Debian policy standart to 3.7.2 
+  * Bumped Debian policy standard to 3.7.2
     + compat set to 5
     + debhelper version raised
     + de-ignoring output from make distclean
diff --git a/debian/control b/debian/control
index 8d92935..4489136 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
 Build-Depends: debhelper (>= 5), dpatch
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+Homepage: http://sourceforge.net/projects/stun/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/stun/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/stun/?op=log
 
 Package: stun
 Architecture: any
@@ -17,5 +18,3 @@ Description: Server daemon and test client for STUN
  help clients behind NAT to tunnel incoming calls through. This server is the
  counterpart to help the client identify the NAT and have it open the proper
  ports for it.
- .
-  Homepage: http://www.vovida.org/applications/downloads/stun/
diff --git a/debian/init.d b/debian/init.d
index 2776f2b..16536e4 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -27,6 +27,7 @@ DAEMON=/usr/sbin/stund
 NAME=stun
 DESC=stun
 START_DAEMON=false
+PIDFILE=/var/run/$NAME.pid
 
 test -x $DAEMON || exit 0
 
@@ -65,13 +66,13 @@ case "$1" in
   start)
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/$NAME.pid \
+		--pidfile $PIDFILE \
 		--chuid $DAEMON_USER --exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 		--chuid $DAEMON_USER --exec $DAEMON
 	echo "$NAME."
 	;;
@@ -85,7 +86,7 @@ case "$1" in
 	#
 	# echo "Reloading $DESC configuration files."
 	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
+	#	$PIDFILE --exec $DAEMON
   #;;
   restart|force-reload)
 	#
@@ -95,16 +96,32 @@ case "$1" in
 	#
 	echo -n "Restarting $DESC: "
 	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
+		$PIDFILE --exec $DAEMON
 	sleep 1
 	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		$PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 	echo "$NAME."
 	;;
+  status)
+       echo -n "Status of $DESC: "
+
+       if [ ! -r "$PIDFILE" ]; then
+           echo "$NAME is not running."
+           exit 3
+       fi
+
+       if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
+           echo "$NAME is running."
+           exit 0
+       else
+           echo "$NAME is not running but $PIDFILE exists."
+           exit 1
+       fi
+       ;;
   *)
 	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	# echo "Usage: $N {start|stop|restart|status|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|status|force-reload}" >&2
 	exit 1
 	;;
 esac
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..74d3ec2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\.dfsg// \
+   http://sf.net/stun/stund_([\d\.]+)_...\d\d\.tgz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/stun.git