[SCM] Mumudvb packaging branch, master, updated. 1.5.3-35-g8dbceb1

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8dbceb1d06d5ab93d8e8a0938c2ef97350a3facf
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Dec 14 13:35:14 2008 +0100

    A few adjustments

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..ab64e15
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/mumudvb.init
diff --git a/debian/mumudvb.init b/debian/mumudvb.init
deleted file mode 100644
index 3b09559..0000000
--- a/debian/mumudvb.init
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          mumudvb
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:      
-# Short-Description: mumudvb
-# Description:       Digital television streaming program
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/mumudvb
-PIDDIR=/var/run/mumudvb
-NAME=Mumudvb
-
-#Reading of the config file
-if [ -f /etc/default/mumudvb ] ; then
-        . /etc/default/mumudvb
-fi
-
-if [ "$DONTSTARTMUMU" = "true" ]; then exit 0; fi
-
-. /lib/lsb/init-functions
-
-test -x $DAEMON || exit 0
-
-set -e
-
-do_start() {
-        if [ ! -d $PIDDIR ]; then
-                mkdir -p $PIDDIR
-        fi
-        chown $DAEMONUSER:$DAEMONUSER $PIDDIR
-	eval $LAUNCH_BEFORE_MUMU
-	for ADAPTER in $ADAPTERS; do
-		#Todo : fails if all card fails
-		log_daemon_msg "     Card $ADAPTER"
-		eval CONFIG_FILE=\$MUMUDVB_CONF_$ADAPTER 
-		if [ ! -f $CONFIG_FILE ]; then
-                   log_warning_msg "        Config file $CONFIG_FILE not found."
-		else
-		   start-stop-daemon --start --oknodo --pidfile "$PIDDIR/mumudvb_carte$ADAPTER.pid"\ 
-               		 --chuid $DAEMONUSER --exec $DAEMON -- $DAEMON_OPTS -c $CONFIG_FILE
-		fi
-	done
-}
-
-do_stop() {
-	for PIDFILE in `ls $PIDDIR/mumudvb_carte*.pid 2> /dev/null`; do
-	        start-stop-daemon --stop --oknodo --pidfile "$PIDFILE" \
-        	        --exec $DAEMON 
-	done
-}
-
-case "$1" in
-  start)
-        if [ ! -f /etc/default/mumudvb ]; then
-                log_failure_msg "/etc/default/mumudvb not found, Can't start $NAME"
-                exit 0
-        fi
-        
-        log_daemon_msg "Starting $NAME"
-        do_start
-        log_end_msg $?
-        ;;
-  stop)
-        log_daemon_msg "Stopping $NAME"
-        do_stop
-        log_end_msg $?
-        ;;
-  restart|force-reload)
-        log_daemon_msg "Restarting $NAME"
-        do_stop
-        sleep 1
-        do_start
-        log_end_msg $?
-        ;;
-  *)
-        log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/debian/mumudvb.postrm b/debian/mumudvb.postrm
index 67b2a95..32332ab 100644
--- a/debian/mumudvb.postrm
+++ b/debian/mumudvb.postrm
@@ -29,7 +29,7 @@ case "$1" in
         # Delete home (refused by deluser because in /var)
         rm -Rf $SYSTEM_HOME
         # Delete user
-        deluser $SYSTEM_USER
+        deluser --system $SYSTEM_USER
 
     ;;
 
diff --git a/debian/rules b/debian/rules
index 1b2c8ad..2c93668 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ GITWEB_URL=http://gitweb.braice.net/gitweb?p=mumudvb.git
 GITWEB_RE=<a href="\/gitweb\?p=mumudvb\.git;a=snapshot;h=([0-9a-f]+)">
 
 build:
+	cp scripts/mumudvb.init debian
 	dh $@
 
 clean:

-- 
Mumudvb packaging