[Python-apps-commits] r962 - in packages/pyicqt/trunk/debian (changelog control init.d)

[nijel at users.alioth.debian.org]

    Date: Monday, April 14, 2008 @ 13:58:39
  Author: nijel
Revision: 962

Use LSB logging functions in init script.

Modified:
  packages/pyicqt/trunk/debian/changelog
  packages/pyicqt/trunk/debian/control
  packages/pyicqt/trunk/debian/init.d

Modified: packages/pyicqt/trunk/debian/changelog
===================================================================
--- packages/pyicqt/trunk/debian/changelog	2008-04-14 13:10:25 UTC (rev 961)
+++ packages/pyicqt/trunk/debian/changelog	2008-04-14 13:58:39 UTC (rev 962)
@@ -1,8 +1,9 @@
 pyicqt (0.8b-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Use LSB logging functions in init script.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 03 Mar 2008 17:57:41 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 14 Apr 2008 15:58:24 +0200
 
 pyicqt (0.8b-2) unstable; urgency=low
 

Modified: packages/pyicqt/trunk/debian/control
===================================================================
--- packages/pyicqt/trunk/debian/control	2008-04-14 13:10:25 UTC (rev 961)
+++ packages/pyicqt/trunk/debian/control	2008-04-14 13:58:39 UTC (rev 962)
@@ -15,6 +15,7 @@
 Architecture: all
 Depends: ${python:Depends}, 
     ${misc:Depends},
+    lsb-base (>= 3.0-6),
     python-twisted (>=2.0.0), 
     python-twisted-web (>=0.5.0), 
     python-twisted-words (>= 0.1.0), 

Modified: packages/pyicqt/trunk/debian/init.d
===================================================================
--- packages/pyicqt/trunk/debian/init.d	2008-04-14 13:10:25 UTC (rev 961)
+++ packages/pyicqt/trunk/debian/init.d	2008-04-14 13:58:39 UTC (rev 962)
@@ -12,10 +12,11 @@
 #                    contacts on the ICQ Messenger network. It can connect to any Jabber server
 #                    that supports the Connect component mechanism.  
 ### END INIT INFO
-set -e
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+. /lib/lsb/init-functions
+
 NAME=pyicqt
 DESC="ICQ transport for Jabber"
 
@@ -38,19 +39,19 @@
 
 case "$1" in
 start)
-	echo -n "Starting $DESC: "
-	(start-stop-daemon --start $SSD_OPTS --startas "$DAEMON" --chuid "$USER" -- $OPTIONS)
-	if test "$?" = 0; then echo "$NAME."; fi
+	log_daemon_msg "Starting $DESC" "$NAME"
+	start-stop-daemon --start $SSD_OPTS --startas "$DAEMON" --chuid "$USER" -- $OPTIONS
+	log_end_msg $?
 	;;
 stop)
-	echo -n "Stopping $DESC: "
-	(start-stop-daemon --stop $SSD_OPTS --retry 10)
-	if test "$?" = 0; then echo "$NAME."; fi
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	start-stop-daemon --stop $SSD_OPTS --retry 10
+	log_end_msg $?
 	;;
 reload|force-reload)
-	echo -n "Reloading $DESC configuration..."
-	(start-stop-daemon --stop $SSD_OPTS --signal HUP)
-	if test "$?" = 0; then echo 'done.'; fi
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	start-stop-daemon --stop $SSD_OPTS --signal HUP
+	log_end_msg $?
 	;;
 restart)
 	$0 stop