Use LSB init script output functions, thus Depend on lsb-base

4 files changed, 23 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index e8c1029..43106c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 inetutils (2:1.4.3+20051212-2) UNRELEASED; urgency=low
 
   * Add texinfo to Build-Depends.
+  * Use LSB init script output functions, thus Depend on lsb-base.
 
  -- Guillem Jover <guillem@debian.org>  Mon,  9 Jan 2006 18:58:16 +0200
 
diff --git a/debian/control.in b/debian/control.in
index 9126bb8..c320d81 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,7 +32,7 @@ Priority: @inetutils:Priority@
 Architecture: any
 Provides: inetd, netkit-inetd
 Conflicts: inetd, netkit-inetd
-Depends: ${shlibs:Depends}, netbase, inetutils-syslogd | system-log-daemon
+Depends: ${shlibs:Depends}, netbase, lsb-base, inetutils-syslogd | system-log-daemon
 Description: Internet super server
  Inetd is the daemon that listens on various TCP and UDP ports and spawns
  programs that can't or won't do it for themselves.
@@ -55,7 +55,7 @@ Architecture: any
 Provides: system-log-daemon, ${syslogd:Provides}
 Conflicts: system-log-daemon, ${syslogd:Provides}
 Replaces: syslogd
-Depends: ${shlibs:Depends}, netbase
+Depends: ${shlibs:Depends}, netbase, lsb-base
 Description: System logging daemon
  The syslog daemon is responsible for providing logging of messages
  received from programs and facilities on the local host as well as
diff --git a/debian/inetutils-inetd.init b/debian/inetutils-inetd.init
index ac5358a..09a3e1b 100644
--- a/debian/inetutils-inetd.init
+++ b/debian/inetutils-inetd.init
@@ -18,32 +18,35 @@ test -x $DAEMON || exit 0
 
 set -e
 
+. /lib/lsb/init-functions
+
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
+	log_daemon_msg "Starting $DESC" "$NAME"
 	start-stop-daemon --start --quiet --oknodo \
 		--pidfile /var/run/$NAME.pid --exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   stop)
-	echo -n "Stopping $DESC: "
+	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --oknodo \
 		--pidfile /var/run/$NAME.pid --exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   reload|force-reload)
-	echo "Reloading $DESC configuration files."
+	log_action_begin_msg "Reloading $DESC configuration files"
 	start-stop-daemon --stop --signal 1 --quiet --pidfile \
 		/var/run/$NAME.pid --exec $DAEMON
+	log_action_end_msg $?
 	;;
   restart)
-	echo -n "Restarting $DESC: "
+	log_daemon_msg "Restarting $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --oknodo --pidfile \
 		/var/run/$NAME.pid --exec $DAEMON
 	sleep 1
 	start-stop-daemon --start --quiet --pidfile \
 		/var/run/$NAME.pid --exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   *)
 	N=/etc/init.d/inetutils-$NAME
diff --git a/debian/inetutils-syslogd.init b/debian/inetutils-syslogd.init
index 25da8a2..f408f59 100644
--- a/debian/inetutils-syslogd.init
+++ b/debian/inetutils-syslogd.init
@@ -19,6 +19,8 @@ test -x $DAEMON || exit 0
 
 set -e
 
+. /lib/lsb/init-functions
+
 # Create a xconsole pipe if it does not exist.
 # Don't create it if Linux's devfs is used, and symlink it on kFreeBSD as it
 # does not allow pipes on /dev.
@@ -42,30 +44,31 @@ fi
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
+	log_daemon_msg "Starting $DESC" "$NAME"
 	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
 		--exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   stop)
-	echo -n "Stopping $DESC: "
+	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
 		--exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   reload|force-reload)
-	echo "Reloading $DESC configuration files."
+	log_action_begin_msg "Reloading $DESC configuration files"
 	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
 		--exec $DAEMON
+	log_action_end_msg $?
 	;;
   restart)
-	echo -n "Restarting $DESC: "
+	log_daemon_msg "Restarting $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
 		--exec $DAEMON
 	sleep 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--exec $DAEMON
-	echo "$NAME."
+	log_end_msg $?
 	;;
   *)
 	N=/etc/init.d/inetutils-$NAME