r1290 - in vdr/vdradmin/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Sat Sep 17 12:45:50 UTC 2005
Author: tschmidt
Date: 2005-09-17 12:45:49 +0000 (Sat, 17 Sep 2005)
New Revision: 1290
Added:
vdr/vdradmin/trunk/debian/docs
vdr/vdradmin/trunk/debian/examples
vdr/vdradmin/trunk/debian/manpages
vdr/vdradmin/trunk/debian/patches/04_epg_filename.dpatch
Removed:
vdr/vdradmin/trunk/debian/patches/21_andreas-datepatch.dpatch
Modified:
vdr/vdradmin/trunk/debian/changelog
vdr/vdradmin/trunk/debian/control
vdr/vdradmin/trunk/debian/copyright
vdr/vdradmin/trunk/debian/patches/00list
vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
vdr/vdradmin/trunk/debian/postinst
vdr/vdradmin/trunk/debian/rules
vdr/vdradmin/trunk/debian/vdradmin.init
vdr/vdradmin/trunk/debian/vdradmin.install
vdr/vdradmin/trunk/debian/vdradmind.conf
vdr/vdradmin/trunk/debian/watch
Log:
vdradmin: switched upstream source to the version from Andreas Mair
Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/changelog 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,3 +1,29 @@
+vdradmin (0.97-am3.3-1) unstable; urgency=low
+
+ * NOT RELEASED YET
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream version, now we use the modified vdradmin version
+ from Andreas Mair <mail at andreas.vdr-developer.org>, as the
+ original upstream decided to stop distributing independant version of
+ vdradmin - new versions will be distributed bundled with linvdr only.
+ Thanks to Tobias Grimm for creating the inofficial vdradmin-am package,
+ where most of the debian specific changes in this updated come from.
+ + Updated 01_dist-var.dpatch
+ + Updated 02_sectmpfiles.dpatch
+ + Updated 03_cfgfiles-fhs.dpatch
+ + Added 04_epg_filename.dpatch
+ + Removed 21_andreas-datepatch.dpatch
+ - Updated debian/watch, debian/copyright
+ - Took over the init-script from vdradmin-am allmoast completely
+ - The new upstream version supports the new info.vdr file from vdr
+ versions >= 1.3.25 (closes: #325767)
+ - Depend on libhtml-parser-perl, libtemplate-perl,
+ and libhtml-template-expr-perl
+ - Bumped Standards-Version to 3.6.2.1
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sat, 17 Sep 2005 11:45:21 +0200
+
vdradmin (0.96-5) unstable; urgency=low
* Thomas Schmidt <tschmidt at debian.org>
Modified: vdr/vdradmin/trunk/debian/control
===================================================================
--- vdr/vdradmin/trunk/debian/control 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/control 2005-09-17 12:45:49 UTC (rev 1290)
@@ -4,11 +4,11 @@
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>
Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 2.0.9)
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.1
Package: vdradmin
Architecture: all
-Depends: perl, libcompress-zlib-perl, libhtml-template-perl, libparse-recdescent-perl, adduser
+Depends: perl, libcompress-zlib-perl, libhtml-template-perl, libparse-recdescent-perl, adduser, libhtml-parser-perl, libtemplate-perl, libhtml-template-expr-perl
Suggests: vdr
Description: Web-based administration tool for vdr
vdradmin provides a webinterface for managing
Modified: vdr/vdradmin/trunk/debian/copyright
===================================================================
--- vdr/vdradmin/trunk/debian/copyright 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/copyright 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,9 +1,10 @@
This package was debianized by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de> on
Wed, 1 Oct 2003 20:36:52 +0200.
-It was downloaded from http://linvdr.org/download/vdradmin/
+It was downloaded from http://andreas.vdr-developer.org/
-Upstream Author: Thomas Koch <tom at linvdr.org>
+Upstream Authors: Thomas Koch <tom at linvdr.org>,
+ Andreas Mair <mail at andreas.vdr-developer.org>
Copyright: 2001-2004, Thomas Koch <tom at linvdr.org>
Added: vdr/vdradmin/trunk/debian/docs
===================================================================
--- vdr/vdradmin/trunk/debian/docs 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/docs 2005-09-17 12:45:49 UTC (rev 1290)
@@ -0,0 +1 @@
+README.translators
Added: vdr/vdradmin/trunk/debian/examples
===================================================================
--- vdr/vdradmin/trunk/debian/examples 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/examples 2005-09-17 12:45:49 UTC (rev 1290)
@@ -0,0 +1,2 @@
+vdradmind.bl_example
+debian/vdradmind.conf
Added: vdr/vdradmin/trunk/debian/manpages
===================================================================
--- vdr/vdradmin/trunk/debian/manpages 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/manpages 2005-09-17 12:45:49 UTC (rev 1290)
@@ -0,0 +1 @@
+vdradmind.pl.1
Modified: vdr/vdradmin/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin/trunk/debian/patches/00list 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/00list 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,4 +1,4 @@
01_dist-var
02_sectmpfiles
03_cfgfiles-fhs
-21_andreas-datepatch
+04_epg_filename
Modified: vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -7,15 +7,15 @@
## DP: instead of local, relative paths
@DPATCH@
-diff -urNad /home/chelli/vdr/cvs/vdr/vdradmin/vdradmind.pl vdradmin/vdradmind.pl
---- /home/chelli/vdr/cvs/vdr/vdradmin/vdradmind.pl 2004-05-27 16:34:55.000000000 +0200
-+++ vdradmin/vdradmind.pl 2004-05-27 16:35:55.000000000 +0200
-@@ -42,7 +42,7 @@
+diff -urNad vdradmin-am/vdradmind.pl /tmp/dpep.zu6cYX/vdradmin-am/vdradmind.pl
+--- vdradmin-am/vdradmind.pl 2005-05-13 20:53:21.000000000 +0200
++++ /tmp/dpep.zu6cYX/vdradmin-am/vdradmind.pl 2005-05-13 20:54:34.000000000 +0200
+@@ -55,7 +55,7 @@
use strict;
#use warnings;
--my $SEARCH_FILES_IN_SYSTEM = 0; # for distribution
-+my $SEARCH_FILES_IN_SYSTEM = 1; # for distribution
+-my $SEARCH_FILES_IN_SYSTEM = 0;
++my $SEARCH_FILES_IN_SYSTEM = 1;
sub true () { 1 };
sub false () { 0 };
Modified: vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -5,40 +5,15 @@
## DP: Use File::Temp to create temporary files in a secure way
@DPATCH@
-diff -urNad vdradmin/vdradmind.pl /tmp/dpep.tZ4BvR/vdradmin/vdradmind.pl
---- vdradmin/vdradmind.pl 2005-03-27 16:06:53.000000000 +0200
-+++ /tmp/dpep.tZ4BvR/vdradmin/vdradmind.pl 2005-03-27 16:08:50.000000000 +0200
-@@ -32,12 +32,15 @@
- unshift(@INC, $BASENAME . "lib/");
- }
-
-+require File::Temp;
-+
- use CGI qw(:no_debug);
- use IO::Socket;
- use HTML::Template::Expr();
- use Time::Local qw(timelocal);
- use POSIX ":sys_wait_h", qw(strftime mktime);
- use MIME::Base64();
-+use File::Temp();
-
- use strict;
- #use warnings;
-@@ -659,7 +662,7 @@
-
- sub GZip {
- my $content = shift;
-- my $filename = "/tmp/vdradmin." . time();
-+ my $filename = new File::Temp("vdradmin-XXXXX", UNLINK => 1);
- open(PIPE, "| gzip -9 - > $filename") || die "cant open pipe to gzip ($!)";
- print PIPE $$content;
- close(PIPE);
-@@ -3038,7 +3041,15 @@
+diff -urNad vdradmin-am/vdradmind.pl /tmp/dpep.qsarK3/vdradmin-am/vdradmind.pl
+--- vdradmin-am/vdradmind.pl 2005-05-13 20:57:30.000000000 +0200
++++ /tmp/dpep.qsarK3/vdradmin-am/vdradmind.pl 2005-05-13 20:57:31.000000000 +0200
+@@ -4049,7 +4049,15 @@
#############################################################################
sub grab_picture {
my $size = $q->param("size");
-- my $file = "/tmp/vdr.jpg";
-+
+- my $file = new File::Temp("vdr-XXXXX", UNLINK => 1, SUFFIX => ".jpg");
++
+ my $file;
+
+ if (! $ENV{TEMPDIR} == "") {
@@ -46,12 +21,12 @@
+ } else {
+ $file = new File::Temp(UNLINK => 1, SUFFIX => '.jpg');
+ }
-+
++
my $maxwidth = 768;
my $maxheight = 576;
my($width, $height);
-@@ -3055,7 +3066,9 @@
- SendCMD("grab $file jpeg 40 $width $height");
+@@ -4066,7 +4074,9 @@
+ SendCMD("grab $file jpeg 70 $width $height");
#SendCMD("grab $file jpeg");
if(-e $file && -r $file) {
- return(header("200", "image/jpeg", ReadFile($file)));
Modified: vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -2,23 +2,28 @@
## 03_cfgfiles-fhs.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change the path to the cfgfile and autotime-file to comply
+## DP: Change the path to the cfgfile and autotimer-file to comply
## DP: with the FHS (vdradmin changes these files at runtime)
@DPATCH@
-diff -urNad vdradmin-0.96/vdradmind.pl /tmp/dpep.0DtdZt/vdradmin-0.96/vdradmind.pl
---- vdradmin-0.96/vdradmind.pl 2005-01-23 21:41:19.000000000 +0100
-+++ /tmp/dpep.0DtdZt/vdradmin-0.96/vdradmind.pl 2005-01-23 21:42:53.000000000 +0100
-@@ -94,10 +94,10 @@
- $AT_FILENAME = "${BASENAME}vdradmind.at";
- } else {
+diff -urNad vdradmin-am-0.97-am3.3/vdradmind.pl /tmp/dpep.kIKzh9/vdradmin-am-0.97-am3.3/vdradmind.pl
+--- vdradmin-am-0.97-am3.3/vdradmind.pl 2005-07-13 18:36:37.000000000 +0200
++++ /tmp/dpep.kIKzh9/vdradmin-am-0.97-am3.3/vdradmind.pl 2005-07-13 18:38:20.000000000 +0200
+@@ -170,12 +170,12 @@
$TEMPLATEDIR = "/usr/share/vdradmin/template";
-- $CONFFILE = "/etc/vdradmin/vdradmind.conf";
-+ $CONFFILE = "/var/lib/vdradmin/vdradmind.conf";
$LOGFILE = "/var/log/$CONFIG{LOGFILE}";
$PIDFILE = "/var/run/vdradmind.pid";
-- $AT_FILENAME = "/etc/vdradmin/vdradmind.at";
-+ $AT_FILENAME = "/var/lib/vdradmin/vdradmind.at";
+- $CONFFILE = "${ETCDIR}/vdradmind.conf";
+- $AT_FILENAME = "${ETCDIR}/vdradmind.at";
+- $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
+- $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
++ $CONFFILE = "/var/lib/vdradmin/vdradmind.conf";
++ $AT_FILENAME = "/var/lib/vdradmin/vdradmind.at";
++ $DONE_FILENAME = "/var/lib/vdradmin/vdradmind.done";
++ $BL_FILENAME = "/var/lib/vdradmin/vdradmind.bl";
+ $USER_CSS = "${ETCDIR}/user.css";
+- bindtextdomain("vdradmin", "/usr/share/locale");
++# bindtextdomain("vdradmin", "/usr/share/locale");
}
+ my $DONE = &DONE_Read || {};
- my $I18NFILE = "i18n.pl";
Added: vdr/vdradmin/trunk/debian/patches/04_epg_filename.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/04_epg_filename.dpatch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/04_epg_filename.dpatch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_epg_filename.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes default path to epg.data file.
+
+ at DPATCH@
+diff -urNad vdradmin-am-0.97-am3.3/vdradmind.pl /tmp/dpep.lA5zLt/vdradmin-am-0.97-am3.3/vdradmind.pl
+--- vdradmin-am-0.97-am3.3/vdradmind.pl 2005-07-13 18:41:36.000000000 +0200
++++ /tmp/dpep.lA5zLt/vdradmin-am-0.97-am3.3/vdradmind.pl 2005-07-13 18:42:12.000000000 +0200
+@@ -129,7 +129,7 @@
+ $CONFIG{ST_VIDEODIR} = "";
+ #
+ $CONFIG{EPG_DIRECT} = 0;
+-$CONFIG{EPG_FILENAME} = "$CONFIG{VIDEODIR}/epg.data";
++$CONFIG{EPG_FILENAME} = "/var/cache/vdr/epg.data";
+ $CONFIG{EPG_PRUNE} = 0;
+ $CONFIG{NO_EVENTID} = 0;
+ $CONFIG{NO_EVENTID_ON} = "";
Property changes on: vdr/vdradmin/trunk/debian/patches/04_epg_filename.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: vdr/vdradmin/trunk/debian/patches/21_andreas-datepatch.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/21_andreas-datepatch.dpatch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/patches/21_andreas-datepatch.dpatch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,59 +0,0 @@
-#!/bin/sh -e
-## Date format change patch (originally from
-## Andreas Mair <mail at andreas.vdr-developer.org>, extracted by
-## Torsten Lang <privat at torstenlang.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The date format has changed from day of month to
-## DP: yyyy-mm-dd in the timer list (lstt command).
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -Nur vdradmin.orig/vdradmind.pl vdradmin/vdradmind.pl
---- vdradmin.orig/vdradmind.pl 2004-02-09 00:57:06.000000000 +0100
-+++ vdradmin/vdradmind.pl 2005-03-31 19:38:47.000000000 +0200
-@@ -1195,13 +1195,20 @@
- substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1,
- ($2 - 1), $1);
- } else { # regular timer
-- $startsse = my_mktime(substr($start, 2, 2),
-- substr($start, 0, 2), $dor, (my_strftime("%m") - 1),
-- my_strftime("%Y"));
--
-- $stopsse = my_mktime(substr($stop, 2, 2),
-- substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
-- (my_strftime("%m") - 1), my_strftime("%Y"));
-+ if ($dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/) { # vdr >= 1.3.23
-+ $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1);
-+ $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1);
-+ }
-+ else { # vdr < 1.3.23
-+ $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") - 1), my_strftime("%Y"));
-+ $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") - 1), my_strftime("%Y"));
-+
-+ # move timers which have expired one month into the future
-+ if(length($dor) != 7 && $stopsse < time) {
-+ $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $dor, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
-+ $stopsse = my_mktime(substr($stop, 2, 2), substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1, (my_strftime("%m") % 12), (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
-+ }
-+ }
- }
-
- # move timers which have expired one month into the future
Modified: vdr/vdradmin/trunk/debian/postinst
===================================================================
--- vdr/vdradmin/trunk/debian/postinst 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/postinst 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,14 +1,6 @@
#!/bin/sh -e
set -e
-TEMPLATE_DIR=/usr/share/vdradmin/template
-
-test -d $TEMPLATE_DIR/English/bilder && rm -rf $TEMPLATE_DIR/English/bilder
-test -d $TEMPLATE_DIR/French/bilder && rm -rf $TEMPLATE_DIR/French/bilder
-
-test -L $TEMPLATE_DIR/English/bilder || ln -s ../Deutsch/bilder $TEMPLATE_DIR/English/bilder
-test -L $TEMPLATE_DIR/French/bilder || ln -s ../Deutsch/bilder $TEMPLATE_DIR/French/bilder
-
# Check if there are still cfgfiles in /etc/vdradmin/ and move them
# to /var/lib/vdradmin
if [ ! -f /var/lib/vdradmin/vdradmind.conf ]; then
Modified: vdr/vdradmin/trunk/debian/rules
===================================================================
--- vdr/vdradmin/trunk/debian/rules 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/rules 2005-09-17 12:45:49 UTC (rev 1290)
@@ -14,10 +14,14 @@
clean-patched:
dh_testdir
dh_testroot
+ -$(MAKE) clean
+ @cp -rf locale.backup/* locale || true
+ @rm -rf locale.backup || true
dh_clean
build: patch-stamp
- # Nothing to build here
+ @cp -r locale locale.backup
+ $(MAKE) all
#
# Note: all files are installed using dh_install
@@ -34,7 +38,7 @@
dh_testroot
dh_installchangelogs HISTORY
dh_installdocs
- dh_installexamples debian/vdradmind.conf
+ dh_installexamples
dh_install
dh_installinit
dh_installman
Modified: vdr/vdradmin/trunk/debian/vdradmin.init
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.init 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/vdradmin.init 2005-09-17 12:45:49 UTC (rev 1290)
@@ -7,17 +7,15 @@
# Default Settings:
-# Username vdradmin should run as:
+# Username/Group vdradmin should run as:
USER=vdradmin
-
-# Group under which vdradmin should run:
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
@@ -26,8 +24,6 @@
. /etc/default/vdradmin
fi
-test "$ENABLED" != "0" || exit 0
-
set -e
# Create Temporary Directory
@@ -56,30 +52,51 @@
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: "
- create_temp
- create_logfile
- TEMPDIR=$TEMPDIR start-stop-daemon --start \
- -c $USER:$GROUP -b -m --pidfile /var/run/vdradmin.pid \
- --exec /usr/bin/vdradmind.pl -- -nf
- echo "$NAME."
+ start_daemon
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon --stop -q -o --pidfile /var/run/vdradmin.pid
- echo "$NAME."
+ stop_daemon
+ echo "$NAME."
;;
restart|force-reload)
echo -n "Restarting $DESC: "
- create_temp
- create_logfile
- start-stop-daemon --stop -q -o --pidfile /var/run/vdradmin.pid
- TEMPDIR=$TEMPDIR start-stop-daemon --start \
- -c $USER:$GROUP -b -m --pidfile /var/run/vdradmin.pid \
- --exec /usr/bin/vdradmind.pl -- -nf
- echo "$NAME."
+ stop_daemon
+ start_daemon
;;
*)
N=/etc/init.d/$NAME
Modified: vdr/vdradmin/trunk/debian/vdradmin.install
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin.install 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/vdradmin.install 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,16 +1,3 @@
-lib/HTML/Template/ usr/share/vdradmin/lib/HTML/
-lib/Text/ usr/share/vdradmin/lib/
-
-template/Deutsch/ usr/share/vdradmin/template/
-
-template/English/*.html usr/share/vdradmin/template/English/
-template/English/*.css usr/share/vdradmin/template/English/
-template/English/*.pl usr/share/vdradmin/template/English/
-
-template/French/*.html usr/share/vdradmin/template/French/
-template/French/*.css usr/share/vdradmin/template/French/
-template/French/*.pl usr/share/vdradmin/template/French/
-
+locale/ usr/share/
+template/ usr/share/vdradmin/
vdradmind.pl usr/bin/
-
-debian/vdradmind.pl.1 usr/share/man/man1/
Modified: vdr/vdradmin/trunk/debian/vdradmind.conf
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmind.conf 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/vdradmind.conf 2005-09-17 12:45:49 UTC (rev 1290)
@@ -21,4 +21,4 @@
TM_MARGIN_BEGIN = 10
LOGINPAGE = 0
VDR_PORT = 2001
-
+ST_LIVE_ON = 0
Modified: vdr/vdradmin/trunk/debian/watch
===================================================================
--- vdr/vdradmin/trunk/debian/watch 2005-09-17 12:39:50 UTC (rev 1289)
+++ vdr/vdradmin/trunk/debian/watch 2005-09-17 12:45:49 UTC (rev 1290)
@@ -1,2 +1,2 @@
version=2
-http://linvdr.org/download/vdradmin/ vdradmin.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate
+http://andreas.vdr-developer.org/main.html vdradmin.*\.tar\.bz2
More information about the pkg-vdr-dvb-changes
mailing list