r1969 - in vdr/vdradmin/trunk/debian: . patches

Thomas Schmidt tschmidt at costa.debian.org
Thu Mar 2 16:26:19 UTC 2006


Author: tschmidt
Date: 2006-03-02 16:26:18 +0000 (Thu, 02 Mar 2006)
New Revision: 1969

Added:
   vdr/vdradmin/trunk/debian/NEWS.Debian
   vdr/vdradmin/trunk/debian/vdradmin-am.default
   vdr/vdradmin/trunk/debian/vdradmin-am.dirs
   vdr/vdradmin/trunk/debian/vdradmin-am.init
   vdr/vdradmin/trunk/debian/vdradmin-am.install
Removed:
   vdr/vdradmin/trunk/debian/NEWS
   vdr/vdradmin/trunk/debian/patches/02_grab_over_svdrp.dpatch
   vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
   vdr/vdradmin/trunk/debian/vdradmin.default
   vdr/vdradmin/trunk/debian/vdradmin.dirs
   vdr/vdradmin/trunk/debian/vdradmin.init
   vdr/vdradmin/trunk/debian/vdradmin.install
Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/control
   vdr/vdradmin/trunk/debian/patches/00list
   vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
Log:
vdradmin: Renamed package to vdradmin-am; New upstream release 3.4.3

Deleted: vdr/vdradmin/trunk/debian/NEWS
===================================================================
--- vdr/vdradmin/trunk/debian/NEWS	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/NEWS	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,14 +0,0 @@
-vdradmin (0.96-4) unstable; urgency=low
-
-  The most important change in this release is that vdradmin from 
-  now on will run under the username vdradmin, not as root, the 
-  configfiles will be changed at installation, so they are owned by 
-  the user and group vdradmin.
-
-  We also changed the path of the files vdradmind.conf and vdradmind.at
-  from /etc/vdradmin/ to /var/lib/vdradmin both files will be moved to 
-  the new directory when they allready exist. The symlink 
-  /etc/vdradmin/vdradmind.conf will be created so will find the cfgfile
-  still under /etc/vdradmin.
-
- -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Sun, 23 Jan 2005 22:34:28 +0100

Copied: vdr/vdradmin/trunk/debian/NEWS.Debian (from rev 1803, vdr/vdradmin/trunk/debian/NEWS)
===================================================================
--- vdr/vdradmin/trunk/debian/NEWS	2006-01-22 11:55:02 UTC (rev 1803)
+++ vdr/vdradmin/trunk/debian/NEWS.Debian	2006-03-02 16:26:18 UTC (rev 1969)
@@ -0,0 +1,22 @@
+vdradmin-am (3.4.3) unstable; urgency=low
+
+  * The package was renamed to vdradmin-am, this change requires that 
+    you edit /etc/default/vdradmin-am if you want to start vdradmin-am 
+    as daemon (just change ENABLED=0 to ENABLED=1)
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Thu,  2 Mar 2006 16:54:43 +0100
+
+vdradmin (0.96-4) unstable; urgency=low
+
+  The most important change in this release is that vdradmin from 
+  now on will run under the username vdradmin, not as root, the 
+  configfiles will be changed at installation, so they are owned by 
+  the user and group vdradmin.
+
+  We also changed the path of the files vdradmind.conf and vdradmind.at
+  from /etc/vdradmin/ to /var/lib/vdradmin both files will be moved to 
+  the new directory when they allready exist. The symlink 
+  /etc/vdradmin/vdradmind.conf will be created so will find the cfgfile
+  still under /etc/vdradmin.
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 23 Jan 2005 22:34:28 +0100

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/changelog	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,3 +1,17 @@
+vdradmin-am (3.4.3-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
+      + Removed dependancy to sendemail
+      + Depend on libnet-perl
+      + Removed 02_grab_over_svdrp.dpatch
+      + Updated 02_sectmpfiles.dpatch
+      + Removed 05_vdr-1.3.38-fix.dpatch
+    - Renamed package from vdradmin to vdradmin-am
+      (Added Provides/Replaces/Conflicts: vdradmin)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu,  2 Mar 2006 16:42:41 +0100
+
 vdradmin (0.97-am3.4.2-3) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdradmin/trunk/debian/control
===================================================================
--- vdr/vdradmin/trunk/debian/control	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/control	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,4 +1,4 @@
-Source: vdradmin
+Source: vdradmin-am
 Section: web
 Priority: optional
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
@@ -6,10 +6,13 @@
 Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 2.0.9)
 Standards-Version: 3.6.2.1
 
-Package: vdradmin
+Package: vdradmin-am
 Architecture: all
-Depends: perl, libcompress-zlib-perl, libhtml-template-perl, libparse-recdescent-perl, adduser, libhtml-parser-perl, libtemplate-perl, libhtml-template-expr-perl, sendemail, liburi-perl
+Depends: perl, libcompress-zlib-perl, libhtml-template-perl, libparse-recdescent-perl, adduser, libhtml-parser-perl, libtemplate-perl, libhtml-template-expr-perl, liburi-perl, libnet-perl
 Suggests: vdr
+Provides: vdradmin
+Replaces: vdradmin
+Conflicts: vdradmin
 Description: Web-based administration tool for vdr
- vdradmin provides a webinterface for managing
+ vdradmin-am provides a webinterface for managing
  the Linux Video Disk Recorder (vdr)

Modified: vdr/vdradmin/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin/trunk/debian/patches/00list	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/patches/00list	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,6 +1,4 @@
 01_dist-var
-02_grab_over_svdrp
 02_sectmpfiles
 03_cfgfiles-fhs
 04_epg_filename
-05_vdr-1.3.38-fix

Deleted: vdr/vdradmin/trunk/debian/patches/02_grab_over_svdrp.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_grab_over_svdrp.dpatch	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/patches/02_grab_over_svdrp.dpatch	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 02_grab_over_svdrp.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make use of the feature to send the screenshot directly over 
-## DP: SVDRP, vdr does not need to write a file itself 
-## DP: (needs VDR >= 1.3.38)
-
- at DPATCH@
-diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.OfaTVv/vdradmin-0.97-am3.4.2/vdradmind.pl
---- vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 21:50:28.279569000 +0100
-+++ /tmp/dpep.OfaTVv/vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 21:50:28.531584750 +0100
-@@ -4569,8 +4569,6 @@
- #############################################################################
- sub grab_picture {
- 	my $size = $q->param("size");
--	my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
--	chmod 0666,$file;
- 	my $maxwidth = 768;
- 	my $maxheight = 576;
- 	my($width, $height);
-@@ -4583,20 +4581,33 @@
- 	} else {
- 		($width, $height) = ($maxwidth / 4, $maxheight / 4);
- 	}
--		
--	SendCMD("grab $file jpeg 70 $width $height");
--	#SendCMD("grab $file jpeg");
--	if(-e $file && -r $file) {
--		return(header("200", "image/jpeg", ReadFile($file)));
--	} else {
--		print "Expected $file does not exist.\n";
--    print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n";
--    print " - VDR has the rights to write $file\n";
--    print " - VDR and VDR Admin run on the same machine\n";
--    print " - VDR Admin may read $file\n";
--    print " - VDR has access to /dev/video* files\n";
--    print " - you have a full featured card\n";
--	}
-+        
-+        my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
-+        
-+        if ($VDRVERSION < 10338) {
-+           chmod 0666,$file;	
-+           SendCMD("grab $file jpeg 70 $width $height");
-+        } else {
-+          my @data = SendCMD("grab - 70 $width $height");
-+          my @uu = grep(!/^Grabbed/, @data);
-+          if(scalar @uu > 0) {
-+             open(FILE, ">$file");
-+             binmode(FILE);
-+             foreach (@uu) { print FILE MIME::Base64::decode_base64($_); }
-+             close FILE;
-+          }
-+       }
-+       if(-e $file && -r $file) {
-+          return(header("200", "image/jpeg", ReadFile($file)));
-+       } else {
-+          print "Expected $file does not exist.\n";
-+          print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n";
-+          print " - VDR has the rights to write $file\n";
-+          print " - VDR and VDR Admin run on the same machine\n";
-+          print " - VDR Admin may read $file\n";
-+          print " - VDR has access to /dev/video* files\n";
-+          print " - you have a full featured card\n";
-+       }
- }
- 
- sub force_update {

Modified: vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2006-03-02 16:26:18 UTC (rev 1969)
@@ -8,32 +8,27 @@
 ## DP: >=1.3.38, keeping it for compatibility with older vdr versions)
 
 @DPATCH@
-diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.2eLRN4/vdradmin-0.97-am3.4.2/vdradmind.pl
---- vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:14:33.121866000 +0100
-+++ /tmp/dpep.2eLRN4/vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:16:58.734966250 +0100
-@@ -4582,7 +4582,13 @@
- 		($width, $height) = ($maxwidth / 4, $maxheight / 4);
- 	}
-         
--        my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
-+        my $file;
-+        
-+        if (! $ENV{TEMPDIR} == "" && $VDRVERSION < 10338) { 
-+           $file = "$ENV{TEMPDIR}/vdradmin.$$.jpg"; 
-+        } else {
-+           $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
-+        }
-         
-         if ($VDRVERSION < 10338) {
-            chmod 0666,$file;	
-@@ -4598,7 +4604,9 @@
-           }
-        }
-        if(-e $file && -r $file) {
--          return(header("200", "image/jpeg", ReadFile($file)));
-+          my $image = header("200", "image/jpeg", ReadFile($file));
-+          unlink($file);
-+          return($image);
-        } else {
-           print "Expected $file does not exist.\n";
-           print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n";
+diff -urNad vdradmin-am-3.4.3/vdradmind.pl /tmp/dpep.AVdZf3/vdradmin-am-3.4.3/vdradmind.pl
+--- vdradmin-am-3.4.3/vdradmind.pl	2006-03-02 17:01:45.425105250 +0100
++++ /tmp/dpep.AVdZf3/vdradmin-am-3.4.3/vdradmind.pl	2006-03-02 17:07:37.279094750 +0100
+@@ -4725,11 +4725,18 @@
+ 
+ 	if ($VDRVERSION < 10338) {
+ 		# Grab using temporary file
+-		my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
++                my $file;
++                if (! $ENV{TEMPDIR} == "" && $VDRVERSION < 10338) { 
++                        $file = "$ENV{TEMPDIR}/vdradmin.$$.jpg"; 
++                } else {
++                        $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
++                }
+ 		chmod 0666,$file if(-e $file);
+ 		SendCMD("grab $file jpeg 70 $width $height");
+ 		if(-e $file && -r $file) {
+-			return(header("200", "image/jpeg", ReadFile($file)));
++                        my $image = header("200", "image/jpeg", ReadFile($file));
++                        unlink($file);
++                        return($image);
+ 		} else {
+ 			print "Expected $file does not exist.\n";
+     			print "Obviously VDR Admin could not find the screenshot file. Ensure that:\n";

Deleted: vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/patches/05_vdr-1.3.38-fix.dpatch	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 05_vdr-1.3.38-fix.dpatch by Dominique Dumont <domi.dumont at free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes vdradmin when used with vdr 1.3.38
-
- at DPATCH@
-diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.Nsh19g/vdradmin-0.97-am3.4.2/vdradmind.pl
---- vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:31:12.805101500 +0100
-+++ /tmp/dpep.Nsh19g/vdradmin-0.97-am3.4.2/vdradmind.pl	2006-01-14 22:33:28.705619000 +0100
-@@ -735,7 +735,7 @@
- 			else {
- 				$bc++;
- 				while($_ = $SVDRP->readoneline) {
--					if(/^E (.*) (.*) (.*) (.*)/ || /^E (.*) (.*) (.*)/) {
-+                                        if(/^E ([^\s]*) ([^\s]*) ([^\s]*) /) {
- 						my($event_id, $time, $duration) = ($1, $2, $3);
- 						my($title, $subtitle, $summary);
- 						while($_ = $SVDRP->readoneline) {

Copied: vdr/vdradmin/trunk/debian/vdradmin-am.default (from rev 1803, vdr/vdradmin/trunk/debian/vdradmin.default)

Copied: vdr/vdradmin/trunk/debian/vdradmin-am.dirs (from rev 1803, vdr/vdradmin/trunk/debian/vdradmin.dirs)

Copied: vdr/vdradmin/trunk/debian/vdradmin-am.init (from rev 1803, vdr/vdradmin/trunk/debian/vdradmin.init)
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.init	2006-01-22 11:55:02 UTC (rev 1803)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.init	2006-03-02 16:26:18 UTC (rev 1969)
@@ -0,0 +1,108 @@
+#! /bin/sh
+#
+#
+# Init-script for vdradmin, created by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
+#
+#
+
+# Default Settings:
+
+# Username/Group vdradmin should run as:
+USER=vdradmin
+GROUP=vdradmin
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/vdradmind.pl
+NAME=vdradmin
+DESC="VDR Webadministration interface"
+PIDFILE=/var/run/vdradmin.pid
+
+test -x $DAEMON || exit 0
+
+# Include vdradmin defaults if available
+if [ -f /etc/default/vdradmin-am ] ; then
+	. /etc/default/vdradmin-am
+fi
+
+set -e
+
+# Create Temporary Directory
+create_temp () 
+{
+	TEMPDIR=`mktemp -d -p /tmp vdradmin-XXXXXX`
+	
+   	# Check if the group vdr exists and make vdr 
+	# the owner of the temporary directory
+	if getent group | grep -q "^vdr:" ; then
+	   chown vdr $TEMPDIR
+        fi
+	
+	chgrp vdradmin $TEMPDIR
+	chmod 2770 $TEMPDIR
+}
+
+# Check if the logfile exists allready, if not, create it and set 
+# group and owner to $USER:$GROUP
+create_logfile ()
+{
+    LOGFILE="/var/log/vdradmind.log"
+    if [ ! -e $LOGFILE ] ; then
+        touch $LOGFILE 
+        chown $USER:$GROUP $LOGFILE
+    fi
+}
+
+init_language_environment()
+{
+    if [ -f /etc/environment ]
+    then
+         for var in LANG LC_ALL LC_CTYPE ; do
+	     value=$(egrep "^[^#]*${var}=" /etc/environment | tail -n1 | cut -d= -f2)
+	     eval $var=$value
+	 done
+    fi
+}
+
+start_daemon()
+{
+    if [ "$ENABLED" != "0" ] ; then
+        init_language_environment
+        create_temp
+        create_logfile
+        LANG=$LANG TEMPDIR=$TEMPDIR start-stop-daemon --start \
+          -c $USER:$GROUP -b -m --pidfile $PIDFILE \
+          --exec /usr/bin/vdradmind.pl -- -nf
+	echo "$NAME."
+    else
+        echo -n "- aborted (to enable the daemon, edit /etc/default/vdradmin-am)"
+    fi
+}
+
+stop_daemon()
+{
+    start-stop-daemon --stop -q -o --pidfile $PIDFILE > /dev/null
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+        start_daemon 
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+        stop_daemon
+        echo "$NAME."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+        stop_daemon
+        start_daemon
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

Copied: vdr/vdradmin/trunk/debian/vdradmin-am.install (from rev 1803, vdr/vdradmin/trunk/debian/vdradmin.install)

Deleted: vdr/vdradmin/trunk/debian/vdradmin.default
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.default	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/vdradmin.default	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,20 +0,0 @@
-# Defaults for vdradmin initscript
-# sourced by /etc/init.d/vdradmin
-# installed at /etc/default/vdradmin by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Should vdradmin's init-script be enabled?
-
-#################################################################
-# ATTENTION! YOU SHOULD MODIFY /var/lib/vdradmin/vdradmind.conf #
-# before enabling this, because the default config uses a       #
-# really simple default username/password (linvdr/linvdr)       #
-#################################################################
-
-ENABLED="0"
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""

Deleted: vdr/vdradmin/trunk/debian/vdradmin.dirs
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.dirs	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/vdradmin.dirs	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,2 +0,0 @@
-var/lib/vdradmin
-etc/vdradmin

Deleted: vdr/vdradmin/trunk/debian/vdradmin.init
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.init	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/vdradmin.init	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,108 +0,0 @@
-#! /bin/sh
-#
-#
-# Init-script for vdradmin, created by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
-#
-#
-
-# Default Settings:
-
-# Username/Group vdradmin should run as:
-USER=vdradmin
-GROUP=vdradmin
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/vdradmind.pl
-NAME=vdradmin
-DESC="VDR Webadministration interface"
-PIDFILE=/var/run/vdradmin.pid
-
-test -x $DAEMON || exit 0
-
-# Include vdradmin defaults if available
-if [ -f /etc/default/vdradmin ] ; then
-	. /etc/default/vdradmin
-fi
-
-set -e
-
-# Create Temporary Directory
-create_temp () 
-{
-	TEMPDIR=`mktemp -d -p /tmp vdradmin-XXXXXX`
-	
-   	# Check if the group vdr exists and make vdr 
-	# the owner of the temporary directory
-	if getent group | grep -q "^vdr:" ; then
-	   chown vdr $TEMPDIR
-        fi
-	
-	chgrp vdradmin $TEMPDIR
-	chmod 2770 $TEMPDIR
-}
-
-# Check if the logfile exists allready, if not, create it and set 
-# group and owner to $USER:$GROUP
-create_logfile ()
-{
-    LOGFILE="/var/log/vdradmind.log"
-    if [ ! -e $LOGFILE ] ; then
-        touch $LOGFILE 
-        chown $USER:$GROUP $LOGFILE
-    fi
-}
-
-init_language_environment()
-{
-    if [ -f /etc/environment ]
-    then
-         for var in LANG LC_ALL LC_CTYPE ; do
-	     value=$(egrep "^[^#]*${var}=" /etc/environment | tail -n1 | cut -d= -f2)
-	     eval $var=$value
-	 done
-    fi
-}
-
-start_daemon()
-{
-    if [ "$ENABLED" != "0" ] ; then
-        init_language_environment
-        create_temp
-        create_logfile
-        LANG=$LANG TEMPDIR=$TEMPDIR start-stop-daemon --start \
-          -c $USER:$GROUP -b -m --pidfile $PIDFILE \
-          --exec /usr/bin/vdradmind.pl -- -nf
-	echo "$NAME."
-    else
-        echo -n "- aborted (to enable the daemon, edit /etc/default/vdradmin)"
-    fi
-}
-
-stop_daemon()
-{
-    start-stop-daemon --stop -q -o --pidfile $PIDFILE > /dev/null
-}
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-        start_daemon 
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-        stop_daemon
-        echo "$NAME."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: "
-        stop_daemon
-        start_daemon
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

Deleted: vdr/vdradmin/trunk/debian/vdradmin.install
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.install	2006-03-02 15:39:17 UTC (rev 1968)
+++ vdr/vdradmin/trunk/debian/vdradmin.install	2006-03-02 16:26:18 UTC (rev 1969)
@@ -1,5 +0,0 @@
-locale/                  usr/share/
-template/                usr/share/vdradmin/
-vdradmind.pl             usr/bin/
-
-debian/vdradmind.pl.1    usr/share/man/man1/




More information about the pkg-vdr-dvb-changes mailing list