debianize plugin

40 files changed, 88 insertions, 510 deletions

diff --git a/vdr-vdrmanager/debian/README.Debian b/vdr-vdrmanager/debian/README.Debian
index c841661..b77313c 100644
--- a/vdr-vdrmanager/debian/README.Debian
+++ b/vdr-vdrmanager/debian/README.Debian
@@ -1,6 +1,6 @@
-vdr-plugin-vdrmanager for Debian
---------------------------------
+vdr-plugin-vdr-vdrmanager for Debian
+------------------------------------
 
 <possible notes regarding this package - if none, delete this file>
 
- -- root <root@unknown>  Mon, 07 Nov 2011 00:28:51 +0100
+ -- root <root@unknown>  Fri, 11 Nov 2011 15:07:56 +0100
diff --git a/vdr-vdrmanager/debian/README.source b/vdr-vdrmanager/debian/README.source
index ab16d44..4e62f81 100644
--- a/vdr-vdrmanager/debian/README.source
+++ b/vdr-vdrmanager/debian/README.source
@@ -1,5 +1,5 @@
-vdr-plugin-vdrmanager for Debian
---------------------------------
+vdr-plugin-vdr-vdrmanager for Debian
+------------------------------------
 
 <this file describes information about the source package, see Debian policy
 manual section 4.14. You WILL either need to modify or delete this file>
diff --git a/vdr-vdrmanager/debian/changelog b/vdr-vdrmanager/debian/changelog
index b6a21c8..9a319de 100644
--- a/vdr-vdrmanager/debian/changelog
+++ b/vdr-vdrmanager/debian/changelog
@@ -1,4 +1,4 @@
-vdr-plugin-vdrmanager (0.3-1) unstable; urgency=low
+vdr-plugin-vdr-vdrmanager (0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
   
@@ -8,5 +8,5 @@ vdr-plugin-vdrmanager (0.3-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>  Mon, 07 Nov 2011 00:28:51 +0100
+ -- root <root@unknown>  Fri, 11 Nov 2011 15:07:56 +0100
 
diff --git a/vdr-vdrmanager/debian/control b/vdr-vdrmanager/debian/control
index c690a63..31b8d52 100644
--- a/vdr-vdrmanager/debian/control
+++ b/vdr-vdrmanager/debian/control
@@ -1,14 +1,14 @@
-Source: vdr-plugin-vdrmanager
+Source: vdr-plugin-vdr-vdrmanager
 Section: video
 Priority: extra
 Maintainer: root <root@unknown>
 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/
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-vdr-vdrmanager/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vdr-vdrmanager/trunk/
 Homepage: <url://example.com>
 
-Package: vdr-plugin-vdrmanager
+Package: vdr-plugin-vdr-vdrmanager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
 Description: <insert up to 60 chars description>
diff --git a/vdr-vdrmanager/debian/cron.d.ex b/vdr-vdrmanager/debian/cron.d.ex
deleted file mode 100644
index cc35139..0000000
--- a/vdr-vdrmanager/debian/cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# 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
diff --git a/vdr-vdrmanager/debian/emacsen-install.ex b/vdr-vdrmanager/debian/emacsen-install.ex
index 26118ad..56140a2 100644
--- a/vdr-vdrmanager/debian/emacsen-install.ex
+++ b/vdr-vdrmanager/debian/emacsen-install.ex
@@ -1,12 +1,12 @@
 #! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/vdr-plugin-vdrmanager
+# /usr/lib/emacsen-common/packages/install/vdr-plugin-vdr-vdrmanager
 
 # Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
 # from the install scripts for gettext by Santiago Vila
 # <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
 
 FLAVOR=$1
-PACKAGE=vdr-plugin-vdrmanager
+PACKAGE=vdr-plugin-vdr-vdrmanager
 
 if [ ${FLAVOR} = emacs ]; then exit 0; fi
 
diff --git a/vdr-vdrmanager/debian/emacsen-remove.ex b/vdr-vdrmanager/debian/emacsen-remove.ex
index 304e9a2..0cd43da 100644
--- a/vdr-vdrmanager/debian/emacsen-remove.ex
+++ b/vdr-vdrmanager/debian/emacsen-remove.ex
@@ -1,13 +1,13 @@
 #!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/vdr-plugin-vdrmanager
+# /usr/lib/emacsen-common/packages/remove/vdr-plugin-vdr-vdrmanager
 
 FLAVOR=$1
-PACKAGE=vdr-plugin-vdrmanager
+PACKAGE=vdr-plugin-vdr-vdrmanager
 
 if [ ${FLAVOR} != emacs ]; then
     if test -x /usr/sbin/install-info-altdir; then
         echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/vdr-plugin-vdrmanager.info.gz
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/vdr-plugin-vdr-vdrmanager.info.gz
     fi
 
     echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
diff --git a/vdr-vdrmanager/debian/emacsen-startup.ex b/vdr-vdrmanager/debian/emacsen-startup.ex
index 3f3efa9..be9cad8 100644
--- a/vdr-vdrmanager/debian/emacsen-startup.ex
+++ b/vdr-vdrmanager/debian/emacsen-startup.ex
@@ -1,25 +1,25 @@
 ;; -*-emacs-lisp-*-
 ;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50vdr-plugin-vdrmanager.el
-;; for the Debian vdr-plugin-vdrmanager package
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50vdr-plugin-vdr-vdrmanager.el
+;; for the Debian vdr-plugin-vdr-vdrmanager package
 ;;
 ;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
 ;; Modified by Dirk Eddelbuettel <edd@debian.org>
 ;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
 
-;; The vdr-plugin-vdrmanager package follows the Debian/GNU Linux 'emacsen' policy and
+;; The vdr-plugin-vdr-vdrmanager package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
 ;; xemacs19, emacs20, xemacs20...).  The compiled code is then
 ;; installed in a subdirectory of the respective site-lisp directory.
 ;; We have to add this to the load-path:
 (let ((package-dir (concat "/usr/share/"
                            (symbol-name flavor)
-                           "/site-lisp/vdr-plugin-vdrmanager")))
-;; If package-dir does not exist, the vdr-plugin-vdrmanager package must have
+                           "/site-lisp/vdr-plugin-vdr-vdrmanager")))
+;; If package-dir does not exist, the vdr-plugin-vdr-vdrmanager package must have
 ;; removed but not purged, and we should skip the setup.
   (when (file-directory-p package-dir)
     (setq load-path (cons package-dir load-path))
-    (autoload 'vdr-plugin-vdrmanager-mode "vdr-plugin-vdrmanager-mode"
-      "Major mode for editing vdr-plugin-vdrmanager files." t)
-    (add-to-list 'auto-mode-alist '("\\.vdr-plugin-vdrmanager$" . vdr-plugin-vdrmanager-mode))))
+    (autoload 'vdr-plugin-vdr-vdrmanager-mode "vdr-plugin-vdr-vdrmanager-mode"
+      "Major mode for editing vdr-plugin-vdr-vdrmanager files." t)
+    (add-to-list 'auto-mode-alist '("\\.vdr-plugin-vdr-vdrmanager$" . vdr-plugin-vdr-vdrmanager-mode))))
 
diff --git a/vdr-vdrmanager/debian/files b/vdr-vdrmanager/debian/files
deleted file mode 100644
index 31caf59..0000000
--- a/vdr-vdrmanager/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-vdr-plugin-vdrmanager_0.2-1_amd64.deb video extra
diff --git a/vdr-vdrmanager/debian/init.d.ex b/vdr-vdrmanager/debian/init.d.ex
index c87119e..fce26aa 100644
--- a/vdr-vdrmanager/debian/init.d.ex
+++ b/vdr-vdrmanager/debian/init.d.ex
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          vdr-plugin-vdrmanager
+# Provides:          vdr-plugin-vdr-vdrmanager
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
@@ -15,9 +15,9 @@
 
 # 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
+DESC=vdr-plugin-vdr-vdrmanager             # Introduce a short description here
+NAME=vdr-plugin-vdr-vdrmanager             # Introduce the short server's name here
+DAEMON=/usr/sbin/vdr-plugin-vdr-vdrmanager # Introduce the server's location here
 DAEMON_ARGS=""             # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
diff --git a/vdr-vdrmanager/debian/init.d.lsb.ex b/vdr-vdrmanager/debian/init.d.lsb.ex
deleted file mode 100644
index cf31c60..0000000
--- a/vdr-vdrmanager/debian/init.d.lsb.ex
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/bin/sh
-#
-# Example init.d script with LSB support.
-#
-# Please read this init.d carefully and modify the sections to
-# adjust it to the program you want to run.
-#
-# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL;  if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides:          vdr-plugin-vdrmanager
-# Required-Start:    $network $local_fs
-# Required-Stop:
-# Should-Start:      $named
-# Should-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 # Introduce the server's location here
-NAME=vdr-plugin-vdrmanager             # Introduce the short server's name here
-DESC=vdr-plugin-vdrmanager             # Introduce a short description here
-LOGDIR=/var/log/vdr-plugin-vdrmanager  # Log directory to use
-
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/$NAME
-DAEMON_OPTS=""          # Additional options given to the server
-
-DIETIME=10              # 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
-
-#STARTTIME=2             # Time to wait for the server to start, in seconds
-                        # If this value is set each time the server is
-                        # started (on start or restart) the script will
-                        # stall to try to determine if it is running
-                        # If it is not set and the server takes time
-                        # to setup a pid file the log message might
-                        # be a false positive (says it did not start
-                        # when it actually did)
-
-LOGFILE=$LOGDIR/$NAME.log  # Server logfile
-#DAEMONUSER=vdr-plugin-vdrmanager   # Users to run the daemons as. If this value
-                        # is set start-stop-daemon will chuid the server
-
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
-    . /etc/default/$NAME
-fi
-
-# Use this if you want the user to explicitly set 'RUN' in
-# /etc/default/
-#if [ "x$RUN" != "xyes" ] ; then
-#    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
-#    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
-#    exit 0
-#fi
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
-    if getent passwd | grep -q "^$DAEMONUSER:"; then
-        # Obtain the uid and gid
-        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
-        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
-    else
-        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
-        exit 0
-    fi
-fi
-
-
-set -e
-
-running_pid() {
-# 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 server
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running() {
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-start_server() {
-# Start the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-            errcode=$?
-        else
-# if we are using a daemonuser then change the user id
-            start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --chuid $DAEMONUSER \
-                        --exec $DAEMON -- $DAEMON_OPTS
-            errcode=$?
-        fi
-        return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            killproc -p $PIDFILE $DAEMON
-            errcode=$?
-        else
-# if we are using a daemonuser then look for process that match
-            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --user $DAEMONUSER \
-                        --exec $DAEMON
-            errcode=$?
-        fi
-
-        return $errcode
-}
-
-reload_server() {
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=pidofproc $PIDFILE # This is the daemon's pid
-    # Send a SIGHUP
-    kill -1 $pid
-    return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
-    [ ! -e "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        sleep "$DIETIME"s
-        if running ; then
-            kill -9 $pid
-            sleep "$DIETIME"s
-            if running ; then
-                echo "Cannot kill $NAME (pid=$pid)!"
-                exit 0
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-}
-
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC " "$NAME"
-        # Check if it's running first
-        if running ;  then
-            log_progress_msg "apparently already running"
-            log_end_msg 0
-            exit 0
-        fi
-        if start_server ; then
-            # NOTE: Some servers might die some time after they start,
-            # this code will detect this issue if STARTTIME is set
-            # to a reasonable value
-            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
-            if  running ;  then
-                # It's ok, the server started and is running
-                log_end_msg 0
-            else
-                # It is not running after we did start
-                log_end_msg 1
-            fi
-        else
-            # Either we could not start it
-            log_end_msg 1
-        fi
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        if running ; then
-            # Only stop the server if we see it running
-            errcode=0
-            stop_server || errcode=$?
-            log_end_msg $errcode
-        else
-            # If it's not running don't do anything
-            log_progress_msg "apparently not running"
-            log_end_msg 0
-            exit 0
-        fi
-        ;;
-  force-stop)
-        # First try to stop gracefully the program
-        $0 stop
-        if running; then
-            # If it's still running try to kill it more forcefully
-            log_daemon_msg "Stopping (force) $DESC" "$NAME"
-            errcode=0
-            force_stop || errcode=$?
-            log_end_msg $errcode
-        fi
-        ;;
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        errcode=0
-        stop_server || errcode=$?
-        # Wait some sensible amount, some server need this
-        [ -n "$DIETIME" ] && sleep $DIETIME
-        start_server || errcode=$?
-        [ -n "$STARTTIME" ] && sleep $STARTTIME
-        running || errcode=$?
-        log_end_msg $errcode
-        ;;
-  status)
-
-        log_daemon_msg "Checking status of $DESC" "$NAME"
-        if running ;  then
-            log_progress_msg "running"
-            log_end_msg 0
-        else
-            log_progress_msg "apparently not running"
-            log_end_msg 1
-            exit 0
-        fi
-        ;;
-  # Use this if the daemon cannot reload
-  reload)
-        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
-        log_warning_msg "cannot re-read the config file (use restart)."
-        ;;
-  # And this if it cann
-  #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.
-          #
-          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-          # if running ; then
-          #    reload_server
-          #    if ! running ;  then
-          # Process died after we tried to reload
-          #       log_progress_msg "died on reload"
-          #       log_end_msg 1
-          #       exit 0
-          #    fi
-          # else
-          #    log_progress_msg "server is not running"
-          #    log_end_msg 1
-          #    exit 0
-          # fi
-                                                                                    #;;
-
-  *)
-        N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/vdr-vdrmanager/debian/install b/vdr-vdrmanager/debian/install
index 2a4d60d..a9a6902 100644
--- a/vdr-vdrmanager/debian/install
+++ b/vdr-vdrmanager/debian/install
@@ -1,2 +1,2 @@
-libvdr-vdrmanager.so.*    usr/lib/vdr/plugins/
-examples/plugin.vdrmanager.conf   etc/vdr/plugins
+libvdr-vdr-vdrmanager.so.*    usr/lib/vdr/plugins/
+debian/tmp/usr/share/locale
diff --git a/vdr-vdrmanager/debian/links.ex b/vdr-vdrmanager/debian/links.ex
index 164b570..324262d 100644
--- a/vdr-vdrmanager/debian/links.ex
+++ b/vdr-vdrmanager/debian/links.ex
@@ -1 +1 @@
-usr/share/vdr-plugin-vdrmanager/vdrmanager    var/lib/vdr/plugins/vdrmanager
+usr/share/vdr-plugin-vdr-vdrmanager/vdr-vdrmanager    var/lib/vdr/plugins/vdr-vdrmanager
diff --git a/vdr-vdrmanager/debian/manpage.1.ex b/vdr-vdrmanager/debian/manpage.1.ex
index 4124f29..4d709ce 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 "November  7, 2011"
+.TH VDR-PLUGIN-VDR-VDRMANAGER SECTION "November 11, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-vdr-plugin-vdrmanager \- program to do something
+vdr-plugin-vdr-vdrmanager \- program to do something
 .SH SYNOPSIS
-.B vdr-plugin-vdrmanager
+.B vdr-plugin-vdr-vdrmanager
 .RI [ options ] " files" ...
 .br
 .B bar
 .RI [ options ] " files" ...
 .SH DESCRIPTION
 This manual page documents briefly the
-.B vdr-plugin-vdrmanager
+.B vdr-plugin-vdr-vdrmanager
 and
 .B bar
 commands.
@@ -33,7 +33,7 @@ commands.
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
 .\" respectively.
-\fBvdr-plugin-vdrmanager\fP is a program that...
+\fBvdr-plugin-vdr-vdrmanager\fP is a program that...
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -53,7 +53,7 @@ The programs are documented fully by
 .IR "The Rise and Fall of a Fooish Bar" ,
 available via the Info system.
 .SH AUTHOR
-vdr-plugin-vdrmanager was written by <upstream author>.
+vdr-plugin-vdr-vdrmanager was written by <upstream author>.
 .PP
 This manual page was written by root <root@unknown>,
 for the Debian project (and may be used by others).
diff --git a/vdr-vdrmanager/debian/manpage.sgml.ex b/vdr-vdrmanager/debian/manpage.sgml.ex
index ba7120d..d900bfb 100644
--- a/vdr-vdrmanager/debian/manpage.sgml.ex
+++ b/vdr-vdrmanager/debian/manpage.sgml.ex
@@ -20,14 +20,14 @@ 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>November  7, 2011</date>">
+  <!ENTITY dhdate      "<date>November 11, 2011</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
   <!ENTITY dhemail     "<email>root@unknown</email>">
   <!ENTITY dhusername  "root">
-  <!ENTITY dhucpackage "<refentrytitle>VDR-PLUGIN-VDRMANAGER</refentrytitle>">
-  <!ENTITY dhpackage   "vdr-plugin-vdrmanager">
+  <!ENTITY dhucpackage "<refentrytitle>VDR-PLUGIN-VDR-VDRMANAGER</refentrytitle>">
+  <!ENTITY dhpackage   "vdr-plugin-vdr-vdrmanager">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/vdr-vdrmanager/debian/manpage.xml.ex b/vdr-vdrmanager/debian/manpage.xml.ex
index 3ab5438..5817b90 100644
--- a/vdr-vdrmanager/debian/manpage.xml.ex
+++ b/vdr-vdrmanager/debian/manpage.xml.ex
@@ -56,9 +56,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
   <!ENTITY dhsection   "SECTION">
   <!-- TITLE should be something like "User commands" or similar (see
        http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
-  <!ENTITY dhtitle     "vdr-plugin-vdrmanager User Manual">
-  <!ENTITY dhucpackage "VDR-PLUGIN-VDRMANAGER">
-  <!ENTITY dhpackage   "vdr-plugin-vdrmanager">
+  <!ENTITY dhtitle     "vdr-plugin-vdr-vdrmanager User Manual">
+  <!ENTITY dhucpackage "VDR-PLUGIN-VDR-VDRMANAGER">
+  <!ENTITY dhpackage   "vdr-plugin-vdr-vdrmanager">
 ]>
 
 <refentry>
diff --git a/vdr-vdrmanager/debian/menu.ex b/vdr-vdrmanager/debian/menu.ex
index 03fc26b..b96ffbe 100644
--- a/vdr-vdrmanager/debian/menu.ex
+++ b/vdr-vdrmanager/debian/menu.ex
@@ -1,2 +1,2 @@
-?package(vdr-plugin-vdrmanager):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
-  title="vdr-plugin-vdrmanager" command="/usr/bin/vdr-plugin-vdrmanager"
+?package(vdr-plugin-vdr-vdrmanager):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="vdr-plugin-vdr-vdrmanager" command="/usr/bin/vdr-plugin-vdr-vdrmanager"
diff --git a/vdr-vdrmanager/debian/postinst.ex b/vdr-vdrmanager/debian/postinst.ex
index 118dd5e..dd5275d 100644
--- a/vdr-vdrmanager/debian/postinst.ex
+++ b/vdr-vdrmanager/debian/postinst.ex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for vdr-plugin-vdrmanager
+# postinst script for vdr-plugin-vdr-vdrmanager
 #
 # see: dh_installdeb(1)
 
diff --git a/vdr-vdrmanager/debian/postrm.ex b/vdr-vdrmanager/debian/postrm.ex
index b61f79d..08ea3c9 100644
--- a/vdr-vdrmanager/debian/postrm.ex
+++ b/vdr-vdrmanager/debian/postrm.ex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for vdr-plugin-vdrmanager
+# postrm script for vdr-plugin-vdr-vdrmanager
 #
 # see: dh_installdeb(1)
 
diff --git a/vdr-vdrmanager/debian/preinst.ex b/vdr-vdrmanager/debian/preinst.ex
index 104f32f..953d8ff 100644
--- a/vdr-vdrmanager/debian/preinst.ex
+++ b/vdr-vdrmanager/debian/preinst.ex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for vdr-plugin-vdrmanager
+# preinst script for vdr-plugin-vdr-vdrmanager
 #
 # see: dh_installdeb(1)
 
diff --git a/vdr-vdrmanager/debian/prerm.ex b/vdr-vdrmanager/debian/prerm.ex
index 488d901..2c66bac 100644
--- a/vdr-vdrmanager/debian/prerm.ex
+++ b/vdr-vdrmanager/debian/prerm.ex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# prerm script for vdr-plugin-vdrmanager
+# prerm script for vdr-plugin-vdr-vdrmanager
 #
 # see: dh_installdeb(1)
 
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.cron.d.ex b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.cron.d.ex
new file mode 100644
index 0000000..116bf23
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.cron.d.ex
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the vdr-plugin-vdr-vdrmanager package
+#
+0 4	* * *	root	[ -x /usr/bin/vdr-plugin-vdr-vdrmanager_maintenance ] && /usr/bin/vdr-plugin-vdr-vdrmanager_maintenance
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.default.ex b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.default.ex
new file mode 100644
index 0000000..47b4e98
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.default.ex
@@ -0,0 +1,10 @@
+# Defaults for vdr-plugin-vdr-vdrmanager initscript
+# sourced by /etc/init.d/vdr-plugin-vdr-vdrmanager
+# installed at /etc/default/vdr-plugin-vdr-vdrmanager by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.doc-base.EX b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.doc-base.EX
new file mode 100644
index 0000000..97ee4e1
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdr-vdrmanager.doc-base.EX
@@ -0,0 +1,20 @@
+Document: vdr-plugin-vdr-vdrmanager
+Title: Debian vdr-plugin-vdr-vdrmanager Manual
+Author: <insert document author here>
+Abstract: This manual describes what vdr-plugin-vdr-vdrmanager is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/vdr-plugin-vdr-vdrmanager/vdr-plugin-vdr-vdrmanager.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/vdr-plugin-vdr-vdrmanager/vdr-plugin-vdr-vdrmanager.ps.gz
+
+Format: text
+Files: /usr/share/doc/vdr-plugin-vdr-vdrmanager/vdr-plugin-vdr-vdrmanager.text.gz
+
+Format: HTML
+Index: /usr/share/doc/vdr-plugin-vdr-vdrmanager/html/index.html
+Files: /usr/share/doc/vdr-plugin-vdr-vdrmanager/html/*.html
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex
deleted file mode 100644
index cc35139..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# 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
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.debhelper.log b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.debhelper.log
deleted file mode 100644
index 723aaba..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.debhelper.log
+++ /dev/null
@@ -1,34 +0,0 @@
-dh_prep
-dh_installdirs
-dh_installdirs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_installinfo
-dh_installmenu
-dh_installcron
-dh_installinit
-dh_installdebconf
-dh_installemacsen
-dh_installcatalogs
-dh_installpam
-dh_installlogrotate
-dh_installlogcheck
-dh_installchangelogs
-dh_installudev
-dh_lintian
-dh_bugfiles
-dh_install
-dh_link
-dh_installmime
-dh_strip
-dh_compress
-dh_fixperms
-dh_makeshlibs
-dh_installdeb
-dh_perl
-dh_shlibdeps
-dh_gencontrol
-dh_link
-dh_md5sums
-dh_builddeb
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.default.ex b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.default.ex
deleted file mode 100644
index 4abf0f7..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.default.ex
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for vdr-plugin-vdrmanager initscript
-# sourced by /etc/init.d/vdr-plugin-vdrmanager
-# installed at /etc/default/vdr-plugin-vdrmanager by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.doc-base.EX b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.doc-base.EX
deleted file mode 100644
index 9af9e47..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: vdr-plugin-vdrmanager
-Title: Debian vdr-plugin-vdrmanager Manual
-Author: <insert document author here>
-Abstract: This manual describes what vdr-plugin-vdrmanager is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/vdr-plugin-vdrmanager/vdr-plugin-vdrmanager.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/vdr-plugin-vdrmanager/vdr-plugin-vdrmanager.ps.gz
-
-Format: text
-Files: /usr/share/doc/vdr-plugin-vdrmanager/vdr-plugin-vdrmanager.text.gz
-
-Format: HTML
-Index: /usr/share/doc/vdr-plugin-vdrmanager/html/index.html
-Files: /usr/share/doc/vdr-plugin-vdrmanager/html/*.html
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.substvars b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.substvars
deleted file mode 100644
index 5cbcb86..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-shlibs:Depends=libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
-vdr:Depends=vdr-abi-1.7.21-yavdr0
-misc:Depends=
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles
deleted file mode 100644
index ad8a805..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/vdr/plugins/plugin.vdrmanager.conf
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/control b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/control
deleted file mode 100644
index 9420642..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: vdr-plugin-vdrmanager
-Version: 0.2-1
-Architecture: amd64
-Maintainer: root <root@unknown>
-Installed-Size: 144
-Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), vdr-abi-1.7.21-yavdr0
-Section: video
-Priority: extra
-Homepage: <url://example.com>
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums
deleted file mode 100644
index d0aa1b4..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums
+++ /dev/null
@@ -1,6 +0,0 @@
-66510c0f5ff337e33895a8b4eecd3841  usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.21
-131368ba58e60dea97a17e88365dbad2  usr/share/doc/vdr-plugin-vdrmanager/README
-3a507cc957c2ab9889a865853deffc77  usr/share/doc/vdr-plugin-vdrmanager/README.Debian
-691953c8881785e75b9d6069fa7fff31  usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
-620880d144f9ddb73a502f6ea123ea38  usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
-0c3f9ceeaf1ea80b4a1adc1a00b47b65  usr/share/doc/vdr-plugin-vdrmanager/copyright
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf
deleted file mode 100644
index 5081563..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Command line parameters for vdr-plugin-vdrmanager
-#
-#   For more details see:
-#   http://projects.vdr-developer.org/projects/vdr-manager/wiki
--p 6420
--P change
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.21 b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.21
deleted file mode 100644
index cc4f328..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.21
+++ /dev/null
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README
deleted file mode 100644
index 7d82ff0..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-See the file COPYING for license information.
-
-Description:
-
-This helper plugin allows remote programming VDR using
-VDR-Manager running on Android devices.
\ No newline at end of file
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian
deleted file mode 100644
index 0dcc16d..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
deleted file mode 100644
index 8c20172..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
+++ /dev/null
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
deleted file mode 100644
index d8ac81d..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
+++ /dev/null
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright
deleted file mode 100644
index 03f8e1b..0000000
--- a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream Homepage:
-    <fill in http/ftp site>
-
-Upstream Author(s):
-    <put author(s) name and email here>
-
-Debian Maintainer(s):
-    root <root@unknown>
-
-Copyright:
-    <put the year(s) of the copyright, and the names of the copyright
-     holder(s) here>
-
-Copyright (Debian packaging):
-    (C) 2011 root
-
-License:
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    The complete text of the GNU General Public License can be found
-    in /usr/share/common-licenses/GPL-2 on most Debian systems.
-
-License (Debian packaging):
-    The Debian packaging is licensed under the GPL, version 2 or any
-    later version, see /usr/share/common-licenses/GPL-2.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them in this file.
-#
-# Check if the upstream sources explicitly state which licenses apply to
-# which action. If this is not the case, ask the upstream author to add such a
-# license disclaimer to all source files or at least to the README. For the
-# GPL2 or GPL3 the small license disclaimer mentioned at the end of the full license
-# text in "How to Apply These Terms to Your New Programs" should be sufficient.
diff --git a/vdr-vdrmanager/debian/watch.ex b/vdr-vdrmanager/debian/watch.ex
index 6cc77f0..73c3b78 100644
--- a/vdr-vdrmanager/debian/watch.ex
+++ b/vdr-vdrmanager/debian/watch.ex
@@ -8,16 +8,16 @@ version=3
 
 # Uncomment to examine a Webpage
 # <Webpage URL> <string match>
-#http://www.example.com/downloads.php vdr-plugin-vdrmanager-(.*)\.tar\.gz
+#http://www.example.com/downloads.php vdr-plugin-vdr-vdrmanager-(.*)\.tar\.gz
 
 # Uncomment to examine a Webserver directory
-#http://www.example.com/pub/vdr-plugin-vdrmanager-(.*)\.tar\.gz
+#http://www.example.com/pub/vdr-plugin-vdr-vdrmanager-(.*)\.tar\.gz
 
 # Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/vdr-plugin-vdrmanager-(.*)\.tar\.gz debian uupdate
+#ftp://ftp.example.com/pub/vdr-plugin-vdr-vdrmanager-(.*)\.tar\.gz debian uupdate
 
 # Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/vdr-plugin-vdrmanager/vdr-plugin-vdrmanager-(.*)\.tar\.gz
+# http://sf.net/vdr-plugin-vdr-vdrmanager/vdr-plugin-vdr-vdrmanager-(.*)\.tar\.gz
 
 # Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html vdr-plugin-vdrmanager-(.*)\.tar\.gz
+# http://example.googlepages.com/foo.html vdr-plugin-vdr-vdrmanager-(.*)\.tar\.gz