0.3 debian

9 files changed, 147 insertions, 145 deletions

diff --git a/vdr-vdrmanager/debian/README.Debian b/vdr-vdrmanager/debian/README.Debian
index 0dcc16d..c841661 100644
--- a/vdr-vdrmanager/debian/README.Debian
+++ b/vdr-vdrmanager/debian/README.Debian
@@ -3,4 +3,4 @@ vdr-plugin-vdrmanager for Debian
 
 <possible notes regarding this package - if none, delete this file>
 
- -- root <root@unknown>  Fri, 21 Oct 2011 23:48:18 +0200
+ -- root <root@unknown>  Mon, 07 Nov 2011 00:28:51 +0100
diff --git a/vdr-vdrmanager/debian/changelog b/vdr-vdrmanager/debian/changelog
index 906188a..b6a21c8 100644
--- a/vdr-vdrmanager/debian/changelog
+++ b/vdr-vdrmanager/debian/changelog
@@ -1,4 +1,4 @@
-vdr-plugin-vdrmanager (0.2-1) unstable; urgency=low
+vdr-plugin-vdrmanager (0.3-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
   
@@ -8,5 +8,5 @@ vdr-plugin-vdrmanager (0.2-1) unstable; urgency=low
   ITP-bug (see http://www.debian.org/devel/wnpp ) and contact the
   Debian VDR packaging team: pkg-vdr-dvb-devel@lists.alioth.debian.org
 
- -- root <root@unknown>  Fri, 21 Oct 2011 23:48:18 +0200
+ -- root <root@unknown>  Mon, 07 Nov 2011 00:28:51 +0100
 
diff --git a/vdr-vdrmanager/debian/control b/vdr-vdrmanager/debian/control
index 3e4e459..c690a63 100644
--- a/vdr-vdrmanager/debian/control
+++ b/vdr-vdrmanager/debian/control
@@ -2,8 +2,8 @@ Source: vdr-plugin-vdrmanager
 Section: video
 Priority: extra
 Maintainer: root <root@unknown>
-Build-Depends: cdbs, debhelper (>= 7), vdr-dev (>= 1.7.16-24yavdr1), gettext
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7.0.50~), vdr-dev (>= 1.7.21-4yavdr1~natty), gettext
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-vdrmanager/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vdrmanager/trunk/
 Homepage: <url://example.com>
diff --git a/vdr-vdrmanager/debian/init.d.ex b/vdr-vdrmanager/debian/init.d.ex
index c56b5ff..c87119e 100644
--- a/vdr-vdrmanager/debian/init.d.ex
+++ b/vdr-vdrmanager/debian/init.d.ex
@@ -1,157 +1,154 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#               Further changes by Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
-#
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          vdr-plugin-vdrmanager
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/vdr-plugin-vdrmanager
-NAME=vdr-plugin-vdrmanager
-DESC=vdr-plugin-vdrmanager
+# Author: root <root@unknown>
 
-test -x $DAEMON || exit 0
-
-LOGDIR=/var/log/vdr-plugin-vdrmanager
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=vdr-plugin-vdrmanager             # Introduce a short description here
+NAME=vdr-plugin-vdrmanager             # Introduce the short server's name here
+DAEMON=/usr/sbin/vdr-plugin-vdrmanager # Introduce the server's location here
+DAEMON_ARGS=""             # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
-DODTIME=1                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Include vdr-plugin-vdrmanager defaults if available
-if [ -f /etc/default/vdr-plugin-vdrmanager ] ; then
-    . /etc/default/vdr-plugin-vdrmanager
-fi
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
 
-set -e
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
 
-running_pid()
+#
+# Function that starts the daemon/service
+#
+do_start()
 {
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected child?
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
 }
 
-running()
+#
+# Function that stops the daemon/service
+#
+do_stop()
 {
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
 }
 
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $LABEL (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
 }
 
 case "$1" in
   start)
-        echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-            --exec $DAEMON -- $DAEMON_OPTS
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-        ;;
+    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+    do_start
+    case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+  ;;
   stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-            --exec $DAEMON
-        echo "$NAME."
-        ;;
-  force-stop)
-        echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-        ;;
-  #reload)
-        #
-        # If the daemon can reload its config files on the fly
-        # for example by sending it SIGHUP, do it here.
-        #
-        # If the daemon responds to changes in its config file
-        # directly anyway, make this a do-nothing entry.
-        #
-        # echo "Reloading $DESC configuration files."
-        # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-        #       /var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-        #
-        # If the "reload" option is implemented, move the "force-reload"
-        # option to the "reload" entry above. If not, "force-reload" is
-        # just the same as "restart" except that it does nothing if the
-        # daemon isn't already running.
-        # check wether $DAEMON is running. If so, restart
-        start-stop-daemon --stop --test --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON \
-            && $0 restart \
-            || exit 0
-        ;;
-  restart)
-    echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        start-stop-daemon --start --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-        echo "$NAME."
-        ;;
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
   status)
-    echo -n "$LABEL is "
-    if running ;  then
-        echo "running"
-    else
-        echo " not running."
-        exit 1
-    fi
-    ;;
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
   *)
-    N=/etc/init.d/$NAME
-    # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-    echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
-    exit 1
-    ;;
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
 esac
 
-exit 0
+:
diff --git a/vdr-vdrmanager/debian/manpage.1.ex b/vdr-vdrmanager/debian/manpage.1.ex
index 2efda3c..4124f29 100644
--- a/vdr-vdrmanager/debian/manpage.1.ex
+++ b/vdr-vdrmanager/debian/manpage.1.ex
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH VDR-PLUGIN-VDRMANAGER SECTION "October 21, 2011"
+.TH VDR-PLUGIN-VDRMANAGER SECTION "November  7, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
diff --git a/vdr-vdrmanager/debian/manpage.sgml.ex b/vdr-vdrmanager/debian/manpage.sgml.ex
index ae506e1..ba7120d 100644
--- a/vdr-vdrmanager/debian/manpage.sgml.ex
+++ b/vdr-vdrmanager/debian/manpage.sgml.ex
@@ -20,7 +20,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
   <!ENTITY dhsurname   "<surname>SURNAME</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>October 21, 2011</date>">
+  <!ENTITY dhdate      "<date>November  7, 2011</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
diff --git a/vdr-vdrmanager/debian/manpage.xml.ex b/vdr-vdrmanager/debian/manpage.xml.ex
index e69468c..3ab5438 100644
--- a/vdr-vdrmanager/debian/manpage.xml.ex
+++ b/vdr-vdrmanager/debian/manpage.xml.ex
@@ -8,14 +8,14 @@
           -''-param man.charmap.use.subset "0" \
           -''-param make.year.ranges "1" \
           -''-param make.single.year.ranges "1" \
-          /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+          /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
           manpage.xml'
 
 A manual page <package>.<section> will be generated. You may view the
 manual page with: nroff -man <package>.<section> | less'. A typical entry
 in a Makefile or Makefile.am is:
 
-DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl
 XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
 manpage.1: manpage.xml
diff --git a/vdr-vdrmanager/debian/source/format b/vdr-vdrmanager/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/vdr-vdrmanager/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex
new file mode 100644
index 0000000..cc35139
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the vdr-plugin-vdrmanager package
+#
+0 4	* * *	root	[ -x /usr/bin/vdr-plugin-vdrmanager_maintenance ] && /usr/bin/vdr-plugin-vdrmanager_maintenance