[Pkg-voip-commits] r2906 - stun/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2007-01-03 20:48:54 +0100 (Wed, 03 Jan 2007)
New Revision: 2906

Added:
   stun/trunk/debian/stun.prerm
Modified:
   stun/trunk/debian/README.Debian
   stun/trunk/debian/changelog
   stun/trunk/debian/init.d
   stun/trunk/debian/stun.default
Log:
Release stun (0.96.dfsg-3).
* Fix installation and don't try to forcibly start daemon
(Closes: #388037, #397074)


Modified: stun/trunk/debian/README.Debian
===================================================================
--- stun/trunk/debian/README.Debian	2007-01-03 19:16:01 UTC (rev 2905)
+++ stun/trunk/debian/README.Debian	2007-01-03 19:48:54 UTC (rev 2906)
@@ -1,6 +1,10 @@
 stund for Debian
 ----------------
+The stund daemon is not started by default.
+To get the daemon to start edit /etc/default/stun and uncomment the
+START_DAEMON=true line
 
+
 A list of publicly available STUN test servers is available at:
 http://www.voip-info.org/wiki/view/STUN
 

Modified: stun/trunk/debian/changelog
===================================================================
--- stun/trunk/debian/changelog	2007-01-03 19:16:01 UTC (rev 2905)
+++ stun/trunk/debian/changelog	2007-01-03 19:48:54 UTC (rev 2906)
@@ -1,8 +1,9 @@
-stun (0.96.dfsg-3) UNRELEASED; urgency=low
+stun (0.96.dfsg-3) unstable; urgency=high
 
-  * NOT RELEASED YET
+  * Fix installation and don't try to forcibly start daemon 
+    (Closes: #388037, #397074)
 
- -- Kilian Krause <kilian at debian.org>  Sun, 22 Oct 2006 14:52:53 +0200
+ -- Kilian Krause <kilian at debian.org>  Wed,  3 Jan 2007 20:44:06 +0100
 
 stun (0.96.dfsg-2) unstable; urgency=low
 

Modified: stun/trunk/debian/init.d
===================================================================
--- stun/trunk/debian/init.d	2007-01-03 19:16:01 UTC (rev 2905)
+++ stun/trunk/debian/init.d	2007-01-03 19:48:54 UTC (rev 2906)
@@ -14,9 +14,14 @@
 DAEMON=/usr/sbin/stund
 NAME=stun
 DESC=stun
+START_DAEMON=false
 
 test -x $DAEMON || exit 0
 
+if [ "$START_DAEMON" != "true" ] ; then 
+	exit 0
+fi
+
 # Include stun defaults if available
 if [ -f /etc/default/stun ] ; then
 	. /etc/default/stun

Modified: stun/trunk/debian/stun.default
===================================================================
--- stun/trunk/debian/stun.default	2007-01-03 19:16:01 UTC (rev 2905)
+++ stun/trunk/debian/stun.default	2007-01-03 19:48:54 UTC (rev 2906)
@@ -6,6 +6,9 @@
 # This is a POSIX shell fragment
 #
 
+#uncommment the next line to allow the init.d script to start the stun daemon 
+#START_DAEMON=true
+
 # Additional options that are passed to the Daemon.
 DAEMON_OPTS=""
 

Added: stun/trunk/debian/stun.prerm
===================================================================
--- stun/trunk/debian/stun.prerm	2007-01-03 19:16:01 UTC (rev 2905)
+++ stun/trunk/debian/stun.prerm	2007-01-03 19:48:54 UTC (rev 2906)
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if [ -x "/etc/init.d/stun" ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d stun stop || exit 0
+	else
+		/etc/init.d/stun stop || exit 0
+	fi
+fi