r1428 - in vdr/vdr-xxv/trunk/debian: . patches upgrade
Tobias Grimm
tiber-guest at costa.debian.org
Thu Nov 3 00:30:11 UTC 2005
Author: tiber-guest
Date: 2005-11-03 00:30:09 +0000 (Thu, 03 Nov 2005)
New Revision: 1428
Added:
vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch
vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch
vdr/vdr-xxv/trunk/debian/upgrade/0.50+574
Removed:
vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch
vdr/vdr-xxv/trunk/debian/patches/99_records_vdr-1.3.26.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/TODO.Debian
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/control
vdr/vdr-xxv/trunk/debian/docs
vdr/vdr-xxv/trunk/debian/init
vdr/vdr-xxv/trunk/debian/install
vdr/vdr-xxv/trunk/debian/links
vdr/vdr-xxv/trunk/debian/patches/00list
vdr/vdr-xxv/trunk/debian/postrm
vdr/vdr-xxv/trunk/debian/rules
vdr/vdr-xxv/trunk/debian/xxvd.cfg
Log:
aktueller zwischenstand
Modified: vdr/vdr-xxv/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-11-03 00:30:09 UTC (rev 1428)
@@ -16,8 +16,11 @@
* Ask for auto-start during debconf (/etc/default/vdr-xxv:ENABLED=0|1)
* FIXME: Handling of defaults should probably be done in dbconfig-common, not
in read_config.pl. Defaults are already defined in debian/config!
+* Maybe only suggest libnet-xmpp-perl?
+* What happens if Version A gets installed ( but not enabled and threrfore
+ no db-tables created) and then an update B is installed?
+* Macht der USRCFGFILE-Parameter Sinn? ("$ENV{HOME}/.xxvd.cfg")
-
DONE:
* Import database configuration from xxvd.cfg and pass it to dbconfig-common
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,3 +1,9 @@
+vdr-xxv (0.50+svn574-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Tobias Grimm <tg at e-tobi.net> Fri, 14 Oct 2005 21:34:02 +0200
+
vdr-xxv (0.42-4) unstable; urgency=low
* Display message if daemon is disabled
Modified: vdr/vdr-xxv/trunk/debian/control
===================================================================
--- vdr/vdr-xxv/trunk/debian/control 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/control 2005-11-03 00:30:09 UTC (rev 1428)
@@ -8,7 +8,7 @@
Package: vdr-xxv
Architecture: all
-Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (> 1.8.2), vdr (>= 1.2.6-6), mysql-client, libevent-perl, libdbi-perl, libtimedate-perl, libtime-hires-perl, libmime-base64-perl, libconfig-tiny-perl, libtemplate-perl, libdate-manip-perl, liburi-perl, ttf-bitstream-vera, libproc-process-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph-perl
+Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (> 1.8.6), vdr (>= 1.3.33-1), mysql-client, ttf-bitstream-vera, libdbi-perl, libconfig-tiny-perl, libtemplate-perl, libproc-process-perl, libterm-readline-gnu-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libdate-manip-perl, txt2html, libio-zlib-perl, libxml-simple-perl, libgd-graph-perl, libtext-asciitable-perl, libdigest-hmac-perl
Recommends: mysql-server
Suggests: mplayer, vdr-plugin-osdteletext | vdr-plugin-teletext
Description: Provides a central service to administer VDR
Modified: vdr/vdr-xxv/trunk/debian/docs
===================================================================
--- vdr/vdr-xxv/trunk/debian/docs 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/docs 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,2 +1,5 @@
-LIESMICH.txt
-TUTORIAL.txt
+doc/LIESMICH.txt
+doc/TUTORIAL.txt.gz
+doc/README.txt
+doc/NEWS.txt
+doc/CHANGELOG.txt
Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/init 2005-11-03 00:30:09 UTC (rev 1428)
@@ -31,6 +31,7 @@
. /etc/default/vdr-xxv
fi
+
#
# Command line options for xxvd - you normally shouldn't touch this!
#
@@ -38,14 +39,22 @@
LOGFILE="/var/log/vdr-xxv/xxvd.log"
PIDFILE="/var/run/vdr-xxv/xxvd.pid"
LOCALEDIR="/usr/share/locale/"
-MODULEDIR="/usr/share/perl5/vdr-xxv/XXV/MODULES/*.pm"
-DOCUDIR="/var/cache/vdr-xxv/doc/"
+MODULEDIR="/usr/share/perl5/vdr-xxv/XXV/MODULES"
+DOCUDIR="/usr/share/doc/vdr-xxv/"
+PODDIR="/var/cache/vdr-xxv/doc/"
HTMLDIR="/usr/share/vdr-xxv/html/"
FONTDIR="/usr/share/fonts/truetype/ttf-bitstream-vera/"
+CONTRIBDIR="/usr/share/vdr-xxv/contrib"
+NEWSTMPL="/usr/share/vdr-xxv/news/"
+NEWSMODS="/usr/share/perl5/vdr-xxv/XXV/OUTPUT/NEWS"
+VTXDIR="/usr/share/vdr-xxv/vtx"
+VERBOSITYLEVEL=3
-COMMANDLINE="-configfile=$CONFIGFILE -logfile=$LOGFILE -pidfile=$PIDFILE \
- -localedir=$LOCALEDIR -moduledir=$MODULEDIR -docudir=$DOCUDIR \
- -htmldir=$HTMLDIR -fontdir=$FONTDIR"
+COMMANDLINE="--configfile=$CONFIGFILE --logfile=$LOGFILE --pidfile=$PIDFILE \
+ --localedir=$LOCALEDIR --moduledir=$MODULEDIR --docudir=$DOCUDIR \
+ --htmldir=$HTMLDIR --fontdir=$FONTDIR --verbose=$VERBOSITYLEVEL \
+ --contrib=$CONTRIBDIR --newstmpl=$NEWSTMPL --newsmods=$NEWSMODS \
+ --vtxdir=$VTXDIR --poddir=$PODDIR"
#
@@ -94,19 +103,16 @@
start)
echo -n "Starting $DESC: "
start
- echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
stop
- echo "$NAME."
;;
restart|force-reload)
echo -n "Restarting $DESC: "
stop
sleep 1
start
- echo "$NAME."
;;
*)
N=/etc/init.d/$NAME
Modified: vdr/vdr-xxv/trunk/debian/install
===================================================================
--- vdr/vdr-xxv/trunk/debian/install 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/install 2005-11-03 00:30:09 UTC (rev 1428)
@@ -7,14 +7,16 @@
html/* usr/share/vdr-xxv/html/default
wml/ usr/share/vdr-xxv/html/
-streamcfg/ usr/share/vdr-xxv/html/
doc/docu.tmpl usr/share/vdr-xxv/doc/
contrib usr/share/vdr-xxv/
+share/news/ usr/share/vdr-xxv/
+share/vtx/ usr/share/vdr-xxv/
lib/Tools.pm usr/share/perl5/vdr-xxv/
lib/Tie/ usr/share/perl5/vdr-xxv/
lib/XXV/ usr/share/perl5/vdr-xxv/
lib/Event/ usr/share/perl5/vdr-xxv/
-lib/Text/ usr/share/perl5/vdr-xxv/
lib/Module/ usr/share/perl5/vdr-xxv/
lib/MP3/ usr/share/perl5/vdr-xxv/
+lib/Net/ usr/share/perl5/vdr-xxv/
+lib/Mail/ usr/share/perl5/vdr-xxv/
Modified: vdr/vdr-xxv/trunk/debian/links
===================================================================
--- vdr/vdr-xxv/trunk/debian/links 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/links 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,3 +1,4 @@
usr/share/vdr-xxv/doc/docu.tmpl var/cache/vdr-xxv/doc/docu.tmpl
var/cache/vdr-xxv/preview usr/share/vdr-xxv/html/default/Preview
var/lib/vdr-xxv/xxvd.cfg etc/xxvd.cfg
+usr/share/common-licenses/GPL-2 usr/share/doc/vdr-xxv/COPYING.txt
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,5 +1,5 @@
01_libpath
02_secure-grab
-04_mplayer-log
-
-99_records_vdr-1.3.26
+03_defaults
+04_static-paths
+05_pod-path
Added: vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch 2005-11-03 00:30:09 UTC (rev 1428)
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_defaults.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set Debian-specific defaults for some settings.
+
+ at DPATCH@
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/EPG.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/EPG.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/EPG.pm 2005-10-29 17:00:19.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/EPG.pm 2005-11-03 00:39:46.000000000 +0100
+@@ -25,13 +25,13 @@
+ Preferences => {
+ epgfile => {
+ description => gettext('Location of epg.data on your system.'),
+- default => '/video/epg.data',
++ default => '/var/cache/vdr/epg.data',
+ type => 'file',
+ required => gettext('This is required!'),
+ },
+ epgimages => {
+ description => gettext('Location of additional EPG images.'),
+- default => '/var/cache/vdrdevel/epgimages',
++ default => '/var/cache/vdr/epgimages',
+ type => 'dir',
+ },
+ interval => {
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/HTTPD.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/HTTPD.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/HTTPD.pm 2005-10-30 10:47:17.000000000 +0100
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/HTTPD.pm 2005-11-03 00:40:05.000000000 +0100
+@@ -63,7 +63,7 @@
+ },
+ HtmlRoot => {
+ description => gettext('tmpl files and images for http server (useful for skins)'),
+- default => 'html',
++ default => 'default',
+ type => 'list',
+ required => gettext('This is required!'),
+ choices => sub{ return $obj->findskins },
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/RECORDS.pm 2005-10-29 17:00:19.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/RECORDS.pm 2005-11-03 00:39:46.000000000 +0100
+@@ -43,7 +43,7 @@
+ },
+ videodir => {
+ description => gettext('Directory, where vdr recordings are stored.'),
+- default => '/video',
++ default => '/var/lib/video',
+ type => 'dir',
+ required => gettext("This is required!"),
+ },
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/REMOTE.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/REMOTE.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/REMOTE.pm 2005-10-08 19:41:46.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/REMOTE.pm 2005-11-03 00:39:46.000000000 +0100
+@@ -28,7 +28,7 @@
+ },
+ commands => {
+ description => gettext('The path to the commands.conf'),
+- default => '/video/commands.conf',
++ default => '/var/lib/vdr/commands.conf',
+ type => 'file',
+ required => gettext('This is required!'),
+ },
Property changes on: vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_mplayer-log.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: hard-code mplayer log file path
-
- at DPATCH@
-diff -urNad vdr-xxv-0.31/lib/XXV/MODULES/RECORDS.pm /tmp/dpep.2esGSB/vdr-xxv-0.31/lib/XXV/MODULES/RECORDS.pm
---- vdr-xxv-0.31/lib/XXV/MODULES/RECORDS.pm 2005-04-16 18:00:08.000000000 +0200
-+++ /tmp/dpep.2esGSB/vdr-xxv-0.31/lib/XXV/MODULES/RECORDS.pm 2005-04-16 18:03:04.000000000 +0200
-@@ -62,12 +62,12 @@
- default => 'Nothing',
- required => gettext("This is required!"),
- },
-- previewlog => {
-- description => gettext('Logfile for mplayer'),
-- default => '/var/log/xxvd_mplayer.log',
-- type => 'string',
-- required => gettext("This is required!"),
-- },
-+# previewlog => {
-+# description => gettext('Logfile for mplayer'),
-+# default => '/var/log/xxvd_mplayer.log',
-+# type => 'string',
-+# required => gettext("This is required!"),
-+# },
- previewcount => {
- description => gettext('How many preview images produce?'),
- default => 3,
-@@ -183,6 +183,7 @@
- },
- );
-
-+ $self->{previewlog} = "/var/log/vdr-xxv/xxvd_preview.log";
- return $self;
- }
-
Added: vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch 2005-11-03 00:30:09 UTC (rev 1428)
@@ -0,0 +1,193 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_static-paths.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hard-code some paths, that most likely wil never be changed on a
+## DP: Debian system
+
+ at DPATCH@
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/LOGREAD.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/LOGREAD.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/LOGREAD.pm 2005-10-08 19:41:46.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/LOGREAD.pm 2005-11-01 21:52:04.000000000 +0100
+@@ -30,24 +30,24 @@
+ type => 'confirm',
+ required => gettext('This is required!'),
+ },
+- tail => {
+- description => sprintf(gettext("Path of command '%s'"),'tail'),
+- default => '/usr/bin/tail',
+- type => 'file',
+- required => gettext('This is required!'),
+- },
++# tail => {
++# description => sprintf(gettext("Path of command '%s'"),'tail'),
++# default => '/usr/bin/tail',
++# type => 'file',
++# required => gettext('This is required!'),
++# },
+ rows => {
+ description => gettext('How much lines to display?'),
+ default => '100',
+ type => 'integer',
+ required => gettext('This is required!'),
+ },
+- syslog => {
+- description => gettext('Path of syslog file?'),
+- default => '/var/log/syslog',
+- type => 'file',
+- required => gettext('This is required!'),
+- },
++# syslog => {
++# description => gettext('Path of syslog file?'),
++# default => '/var/log/syslog',
++# type => 'file',
++# required => gettext('This is required!'),
++# },
+ },
+ Commands => {
+ logger => {
+@@ -84,6 +84,8 @@
+ return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@);
+ } keys %{$self->{MOD}->{Prereq}};
+
++ $self->{syslog} = "/var/log/syslog";
++ $self->{tail} = "/usr/bin/tail";
+ return $self;
+ }
+
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/RECORDS.pm 2005-10-29 17:00:19.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/RECORDS.pm 2005-11-01 21:51:43.000000000 +0100
+@@ -65,12 +65,12 @@
+ default => 'Nothing',
+ required => gettext("This is required!"),
+ },
+- previewlog => {
+- description => gettext('Log file of produce preview images.'),
+- default => '/var/log/xxvd_mplayer.log',
+- type => 'file',
+- required => gettext("This is required!"),
+- },
++# previewlog => {
++# description => gettext('Log file of produce preview images.'),
++# default => '/var/log/xxvd_mplayer.log',
++# type => 'file',
++# required => gettext("This is required!"),
++# },
+ previewcount => {
+ description => gettext('How many preview images produce?'),
+ default => 3,
+@@ -81,12 +81,12 @@
+ default => 'n',
+ type => 'confirm',
+ },
+- previewimages => {
+- description => gettext('common directory for preview images'),
+- default => '/var/cache/xxv/preview',
+- type => 'dir',
+- required => gettext('This is required!'),
+- },
++# previewimages => {
++# description => gettext('common directory for preview images'),
++# default => '/var/cache/xxv/preview',
++# type => 'dir',
++# required => gettext('This is required!'),
++# },
+ vfat => {
+ description => gettext('Set this if your filename encoded for vfat filesystems'),
+ default => 'y',
+@@ -194,6 +194,8 @@
+ },
+ );
+
++ $self->{previewlog} = "/var/log/vdr-xxv/xxvd_preview.log";
++ $self->{previewimages} = "/var/cache/xxv/preview";
+ return $self;
+ }
+
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/STATUS.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/STATUS.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/STATUS.pm 2005-10-16 23:49:21.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/STATUS.pm 2005-11-01 21:50:34.000000000 +0100
+@@ -30,24 +30,24 @@
+ type => 'confirm',
+ required => gettext('This is required!'),
+ },
+- whoBinary => {
+- description => sprintf(gettext("Path of command '%s'"),'who'),
+- default => "/usr/bin/who",
+- type => "file",
+- required => gettext('This is required!'),
+- },
+- wcBinary => {
+- description => sprintf(gettext("Path of command '%s'"),'wc'),
+- default => "/usr/bin/wc",
+- required => gettext('This is required!'),
+- type => "file",
+- },
+- dfBinary => {
+- description => sprintf(gettext("Path of command '%s'"),'df'),
+- default => "/bin/df",
+- required => gettext('This is required!'),
+- type => "file",
+- },
++# whoBinary => {
++# description => sprintf(gettext("Path of command '%s'"),'who'),
++# default => "/usr/bin/who",
++# type => "file",
++# required => gettext('This is required!'),
++# },
++# wcBinary => {
++# description => sprintf(gettext("Path of command '%s'"),'wc'),
++# default => "/usr/bin/wc",
++# required => gettext('This is required!'),
++# type => "file",
++# },
++# dfBinary => {
++# description => sprintf(gettext("Path of command '%s'"),'df'),
++# default => "/bin/df",
++# required => gettext('This is required!'),
++# type => "file",
++# },
+ interval => {
+ description => gettext('Interval in seconds to remember data'),
+ default => 15,
+@@ -150,6 +150,9 @@
+ },
+ ) if($self->{active} eq 'y');
+
++ $self->{whoBinary} = "/usr/bin/who";
++ $self->{wcBinary} = "/usr/bin/wc";
++ $self->{dfBinary} = "/bin/df";
+ return $self;
+ }
+
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/USER.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/USER.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/USER.pm 2005-10-31 17:10:38.000000000 +0100
++++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/USER.pm 2005-11-01 21:50:34.000000000 +0100
+@@ -60,12 +60,12 @@
+ return $value;
+ },
+ },
+- tempimages => {
+- description => gettext('common directory for temporary images'),
+- default => '/var/cache/xxv/temp',
+- type => 'dir',
+- required => gettext('This is required!'),
+- },
++# tempimages => {
++# description => gettext('common directory for temporary images'),
++# default => '/var/cache/xxv/temp',
++# type => 'dir',
++# required => gettext('This is required!'),
++# },
+ },
+ Commands => {
+ unew => {
+@@ -133,6 +133,7 @@
+ # The Initprocess
+ my $erg = $self->init or return error('Problem to initialze Module');
+
++ $self->{tempimages} = "/var/cache/vdr-xxv/images";
+ return $self;
+ }
+
Property changes on: vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch 2005-11-03 00:30:09 UTC (rev 1428)
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_pod-path.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Extra parameter to specify directory, where pod-files are generated
+
+ at DPATCH@
+diff -urNad vdr-xxv-0.50+svn574~/bin/xxvd vdr-xxv-0.50+svn574/bin/xxvd
+--- vdr-xxv-0.50+svn574~/bin/xxvd 2005-11-03 01:02:29.000000000 +0100
++++ vdr-xxv-0.50+svn574/bin/xxvd 2005-11-03 01:05:20.000000000 +0100
+@@ -24,6 +24,7 @@
+ CFGFILE => "$RealBin/../etc/xxvd.cfg",
+ USRCFGFILE => "$ENV{HOME}/.xxvd.cfg",
+ DOCPATH => "$RealBin/../doc",
++ PODPATH => "$RealBin/../doc",
+ HTMLDIR => "$RealBin/../",
+ FONTPATH => "$RealBin/../share/fonts/ttf-bitstream-vera",
+ VTXPATH => "$RealBin/../share/vtx",
+@@ -160,6 +161,7 @@
+ "localedir=s" => \$PATHS->{LOCDIRNAME},
+ "moduledir=s" => \$PATHS->{MODPATH},
+ "docudir=s" => \$PATHS->{DOCPATH},
++ "poddir=s" => \$PATHS->{PODPATH},
+ "htmldir=s" => \$PATHS->{HTMLDIR},
+ "fontdir=s" => \$PATHS->{FONTPATH},
+ "vtxdir=s" => \$PATHS->{VTXPATH},
+@@ -492,12 +494,12 @@
+ my $tt = Template->new(
+ START_TAG => '\<\?\%', # Tagstyle
+ END_TAG => '\%\?\>', # Tagstyle
+- INCLUDE_PATH => $PATHS->{DOCPATH},# or list ref
++ INCLUDE_PATH => $PATHS->{PODPATH},# or list ref
+ INTERPOLATE => 1, # expand "$var" in plain text
+ EVAL_PERL => 1, # evaluate Perl code blocks
+ );
+
+- my $target = $PATHS->{DOCPATH};
++ my $target = $PATHS->{PODPATH};
+ my $tmpl = 'docu.tmpl';
+ my $mods = getModules;
+
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Console.pm vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Console.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Console.pm 2005-10-23 18:26:36.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Console.pm 2005-11-03 01:03:46.000000000 +0100
+@@ -595,7 +595,7 @@
+ my $modname = uc(shift) || return error ('No Modname!' );
+ $modname = ucfirst($modname) if($modname eq 'GENERAL');
+
+- my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{DOCPATH}, $modname);
++ my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname);
+ return $obj->err(gettext('Module %s not found!'), $modname)
+ unless(-r $podfile);
+ my $tmpdir = main::getModule('USER')->userTmp;
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Html.pm vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Html.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Html.pm 2005-10-30 10:47:17.000000000 +0100
++++ vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Html.pm 2005-11-03 01:03:12.000000000 +0100
+@@ -516,7 +516,7 @@
+ my $modname = uc(shift) || return error ('No Modname!' );
+ $modname = ucfirst($modname) if($modname eq 'GENERAL');
+
+- my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{DOCPATH}, $modname);
++ my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname);
+ return $obj->err(gettext('Module %s not found!'), $modname)
+ unless(-r $podfile);
+ my $tmpdir = main::getModule('USER')->userTmp;
+diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Wml.pm vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Wml.pm
+--- vdr-xxv-0.50+svn574~/lib/XXV/OUTPUT/Wml.pm 2005-10-26 20:31:50.000000000 +0200
++++ vdr-xxv-0.50+svn574/lib/XXV/OUTPUT/Wml.pm 2005-11-03 01:03:23.000000000 +0100
+@@ -392,7 +392,7 @@
+ my $modname = shift || return error ('No Modname!' );
+ $modname = ucfirst($modname) if($modname eq 'GENERAL');
+
+- my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{DOCPATH}, $modname);
++ my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname);
+ my $tmpdir = main::getModule('USER')->userTmp;
+ my $outfile = sprintf('%s/%s_%d.pod', $tmpdir, $modname, time);
+
Property changes on: vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: vdr/vdr-xxv/trunk/debian/patches/99_records_vdr-1.3.26.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/99_records_vdr-1.3.26.dpatch 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/patches/99_records_vdr-1.3.26.dpatch 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,179 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_records_vdr-1.3.26.dpatch by Hulk
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes bug with recordings on vdr 1.3.26
-
- at DPATCH@
-diff -Nur xxv-0.42.org/html/rlist.tmpl xxv-0.42/html/rlist.tmpl
---- xxv-0.42.org/html/rlist.tmpl 2005-05-30 10:51:41.000000000 +0200
-+++ xxv-0.42/html/rlist.tmpl 2005-06-17 20:13:32.000000000 +0200
-@@ -1,7 +1,5 @@
- <body class="frame">
-
--<?% trash = param.usage.shift %?>
--
- <div id="body">
- <?% BLOCK time # Show german dateformat without seconds%?>
- <?% ts = t.match('(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)') %?>
-@@ -59,9 +57,6 @@
- </td>
- </tr>
- <?% END %?>
-- <tr>
-- <td class="bottom180"></td>
-- </tr>
- </table>
- </td>
-
-@@ -71,9 +66,7 @@
- <?% END %?>
- <h1><?% gettext("Stored recordings") %?>
- <?% IF search.defined %?> : "<?% search %?>" <?% END %?>
-- <?% param.usage.first.5 %?>
-- <?% gettext('over') %?> <a href="?cmd=sf"><?% param.usage.first.0 %?></a>
-- <?% gettext("used") %?>
-+ <small>(<?% param.usage %?>)</small>
- </h1>
- <?% IF data.size %?>
- <?% fields = data.shift %?>
-@@ -90,12 +83,12 @@
- <?% IF browse.defined && browse != "" %?>
- <?% directorys = browse.split('~') %?>
- <?% IF directorys.size <= 1 %?>
-- <a class="sidetext" title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
-+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
- <?% ELSE %?>
- <?% t = directorys.pop %?>
- <?% directory = directorys.join('~') %?>
-- <a class="sidetext" title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
-- <a class="sidetext" title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>">[<<]</a>
-+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
-+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>">[<<]</a>
- <?% END %?>
- <br />
- <?% END %?>
-diff -Nur xxv-0.42.org/lib/XXV/MODULES/RECORDS.pm xxv-0.42/lib/XXV/MODULES/RECORDS.pm
---- xxv-0.42.org/lib/XXV/MODULES/RECORDS.pm 2005-06-06 18:34:59.000000000 +0200
-+++ xxv-0.42/lib/XXV/MODULES/RECORDS.pm 2005-06-17 20:13:24.000000000 +0200
-@@ -236,14 +236,29 @@
- # Delete old Records
- $obj->{dbh}->do('DELETE FROM RECORDS');
-
-+ # Get state from used harddrive (/video)
-+ my $stat = $obj->{svdrp}->command('stat disk');
-+ if($stat->[1] and $stat->[1] =~ /^250/s) {
-+ #250 473807MB 98028MB 79%
-+ my ($total, $free, $percent)
-+ = $stat->[1] =~ /^250[\-|\s](\S+)\s+(\S+)\s+(\S+)/s;
-+
-+ $obj->{usage} = sprintf(gettext("Used %s, Total %s, Free %s"),$percent,$total, $free);
-+
-+ } else {
-+ error("Can't get disc state : ".join("\n", @$stat));
-+ $obj->{usage} = gettext("Unknown disc capacity!");
-+ }
-+
- # Records einlesen
- my $erg = $obj->{svdrp}->command('lstr');
-
- my @merkIds;
- foreach my $record (@$erg) {
-- if(my $anahash = $obj->analyze($record)) {
-+ next if($record =~ /^22/);
-+ my $anahash = $obj->analyze($record);
-+ if(ref $anahash eq 'HASH') {
- push(@merkIds, $anahash->{EventId});
--
- ++$c
- if($obj->insert($anahash));
- }
-@@ -317,21 +332,31 @@
- # ------------------
- my $obj = shift || return error ('No Object!' );
- my $record = shift || return;
-- my ($id, $day, $month, $hour, $minute, $state, $duration, $title);
-+ my ($id, $date, $hour, $minute, $state, $duration, $title);
-+ my ($day,$month,$year);
-
- if($record =~ /\s+\d+´\s+/) { # VDR is patched with recording length patch
- # 250-1 01.11 15:14* 50´ Discovery~Die Rose von Kerrymore Spielfilm D/2000
-- ($id, $day, $month, $hour, $minute, $state, $duration, $title)
-- = $record =~ /^250[\-|\s](\d+)\s+(\d+)\.(\d+)\s+(\d+)\:(\d+)(.?)\s*(\d*).*?\s+(.+)/si;
-+ ($id, $date, $hour, $minute, $state, $duration, $title)
-+ = $record =~ /^250[\-|\s](\d+)\s+([\d|\.]+)\s+(\d+)\:(\d+)(.?)\s*(\d*).*?\s+(.+)/si;
- } else { # Vanilla VDR
- # 250-1 01.11 15:14* Discovery~Die Rose von Kerrymore Spielfilm D/2000
-- ($id, $day, $month, $hour, $minute, $state, $title)
-- = $record =~ /^250[\-|\s](\d+)\s+(\d+)\.(\d+)\s+(\d+)\:(\d+)(.?).*?\s+(.+)/si;
-+ ($id, $date, $hour, $minute, $state, $title)
-+ = $record =~ /^250[\-|\s](\d+)\s+([\d|\.]+)\s+(\d+)\:(\d+)(.?).*?\s+(.+)/si;
-+ }
-+
-+ return error("Can't analyze record : ".$record)
-+ unless($id);
-+
-+ # Split date
-+ if($date =~ /^(\d+)\.(\d+)$/) { # on DD.MM before 1.3.26
-+ ($day,$month) = $date =~ /^(\d+)\.(\d+)$/;
-+ } else { # on DD.MM.YY on 1.3.26
-+ ($day,$month,$year) = $date =~ /^(\d+)\.(\d+)\.(\d+)$/;
- }
-- return unless($id);
-
- my $info = $obj->videoInfo($day, $month, $hour, $minute, $title)
-- or return error("Can not find recording for Id $id!");
-+ or return warn("Can not find recording for Id $id!");
-
- return unless(ref $info eq 'HASH');
- my @t = split('~', $title);
-@@ -342,8 +367,12 @@
- $title = join('~', at t);
- }
-
-- # XXX: Noch werden nicht alle Records korrekt erkannt
-- my $year = ($info->{mtime}->[5] || 105) + 1900;
-+ $year = ($info->{mtime}->[5] || 2005)
-+ if(!defined $year);
-+ $year += 100
-+ if($year < 70); # Adjust year, 0-69 => 100-169 (2000-2069)
-+ $year += 1900
-+ if($year < 1900); # Adjust year, 70-99 => 1977-1999 ... 2000-2069
- my $start = timelocal(0,$minute,$hour,$day,$month-1, $year);
- my $dur = ($duration) ? $duration : (exists $info->{duration}) ? $info->{duration} : 0;
- my $event = $obj->SearchEpgId( $start, $dur, $title, $subtitle );
-@@ -393,7 +422,7 @@
- my $obj = shift || return error ('No object!' );
- my $day = shift || return error ('No day!' );
- my $month = shift || return error ('No month!' );
-- my $hour = shift || return error ('No hour!' );
-+ my $hour = shift || return error ('No hour!' );
- my $minute = shift || return error ('No minute!' );
- my $title = shift || return error ('No title!' );
-
-@@ -716,11 +745,8 @@
- my $erg = $obj->{dbh}->selectall_arrayref($sql);
- unshift(@$erg, $fields);
-
-- # Usage
-- my $mod = main::getModule('STATUS');
--
- my $param = {
-- usage => $mod->videoMounts($obj->{videodir}),
-+ usage => $obj->{usage},
- previewcommand => $obj->{previewcommand},
- getPreview => sub{ return $obj->getPreviewFiles(@_) },
- };
-@@ -759,11 +785,8 @@
- my $erg = $obj->{dbh}->selectall_arrayref($sql);
- unshift(@$erg, $fields);
-
-- # Usage
-- my $mod = main::getModule('STATUS');
--
- my $param = {
-- usage => $mod->videoMounts($obj->{videodir}),
-+ usage => $obj->{usage},
- previewcommand => $obj->{previewcommand},
- getPreview => sub{ return $obj->getPreviewFiles(@_) },
- };
Modified: vdr/vdr-xxv/trunk/debian/postrm
===================================================================
--- vdr/vdr-xxv/trunk/debian/postrm 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/postrm 2005-11-03 00:30:09 UTC (rev 1428)
@@ -20,7 +20,7 @@
case "$1" in
purge)
rm -f /var/lib/vdr-xxv/xxvd.cfg || true
- rm -rf /var/cache/vdr-xxv/doc/* || true
+ rm -rf /var/cache/vdr-xxv/doc || true
rm -f /var/log/vdr-xxv/* || true
rm -rf /var/cache/vdr-xxv/preview || true
rm -f /var/run/vdr-xxv/* || true
Modified: vdr/vdr-xxv/trunk/debian/rules
===================================================================
--- vdr/vdr-xxv/trunk/debian/rules 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/rules 2005-11-03 00:30:09 UTC (rev 1428)
@@ -55,14 +55,10 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_installchangelogs CHANGELOG.txt
+ dh_installchangelogs doc/CHANGELOG.txt
dh_installdocs
dh_installexamples
dh_install
-
- # will be replaced by a symlink to /var/cache/vdr-xxv/preview:
- rm -r $(CURDIR)/debian/vdr-xxv/usr/share/vdr-xxv/html/default/Preview
-
# dh_installmenu
dh_installdebconf
dh_installlogrotate
Added: vdr/vdr-xxv/trunk/debian/upgrade/0.50+574
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.50+574 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.50+574 2005-11-03 00:30:09 UTC (rev 1428)
@@ -0,0 +1,141 @@
+#
+# MySQL Diff 1.5.0
+#
+# http://www.mysqldiff.com
+# (c) 2001-2004, Lippe-Net Online-Service
+#
+# Erstellt am: 02.11.2005 00:08
+#
+# --------------------------------------------------------
+# Quelldatenbank
+# Host: localhost
+# Datenbank: xxv42
+# --------------------------------------------------------
+# Zieldatenbank
+# Host: localhost
+# Datenbank: xxv
+# --------------------------------------------------------
+#
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+#
+# DDL START
+#
+CREATE TABLE CHANNELGROUPS (
+ Id int(11) NOT NULL DEFAULT 0 auto_increment,
+ Name varchar(100) NULL DEFAULT 'unknown',
+ Counter int(11) NULL DEFAULT '0',
+ PRIMARY KEY (Id)
+) TYPE=MyISAM;
+
+CREATE TABLE VERSION (
+ Version tinyint(4) NOT NULL DEFAULT '0'
+) TYPE=MyISAM;
+
+ALTER TABLE AUTOTIMER
+ MODIFY Id int(16) unsigned NOT NULL DEFAULT 0 auto_increment,
+ ALTER VPS SET DEFAULT 'y',
+ MODIFY Weekdays set('Mon','Tue','Wed','Thu','Fri','Sat','Sun') NOT NULL DEFAULT '',
+ COMMENT='';
+#
+# Feldformate
+# AUTOTIMER.Id geändert von int(11) NOT NULL DEFAULT 0 auto_increment nach int(16) unsigned NOT NULL DEFAULT 0 auto_increment.
+# AUTOTIMER.Weekdays geändert von set('Mon','Tue','Wed','Thu','Fri','Sat','Sun') NULL DEFAULT NULL nach set('Mon','Tue','Wed','Thu','Fri','Sat','Sun') NOT NULL DEFAULT ''.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE CHANNELS
+ ADD GRP int(11) NULL DEFAULT '0' AFTER RID,
+ COMMENT='';
+
+
+ALTER TABLE EPG
+ ADD image varchar(100) NULL DEFAULT '' AFTER tableid,
+ MODIFY eventid int(16) unsigned NOT NULL DEFAULT '0',
+ ADD FULLTEXT INDEX title (title, subtitle, description),
+ COMMENT='';
+#
+# Feldformat
+# EPG.eventid geändert von int(11) NOT NULL DEFAULT '0' nach int(16) unsigned NOT NULL DEFAULT '0'.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE MUSIC
+ MODIFY Id int(16) unsigned NOT NULL DEFAULT 0 auto_increment,
+ COMMENT='';
+#
+# Feldformat
+# MUSIC.Id geändert von int(11) NOT NULL DEFAULT 0 auto_increment nach int(16) unsigned NOT NULL DEFAULT 0 auto_increment.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE OLDEPG
+ ADD image text NULL DEFAULT NULL AFTER tableid,
+ MODIFY eventid int(16) unsigned NOT NULL DEFAULT '0',
+ COMMENT='';
+#
+# Feldformat
+# OLDEPG.eventid geändert von int(11) NOT NULL DEFAULT '0' nach int(16) unsigned NOT NULL DEFAULT '0'.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE RECORDS
+# ADD eventid int(16) unsigned NOT NULL DEFAULT '0' FIRST,
+ ADD State tinyint(4) NOT NULL DEFAULT '0' AFTER Lifetime,
+ CHANGE EventId eventid int(16) unsigned NOT NULL DEFAULT '0' FIRST,
+# DROP EventId,
+ MODIFY RecordId int(16) unsigned NOT NULL DEFAULT '0',
+# DROP PRIMARY KEY,
+# ADD PRIMARY KEY (eventid),
+# DROP INDEX EventId,
+# ADD UNIQUE eventid (eventid),
+ COMMENT='';
+#
+# Feldformat
+# RECORDS.RecordId geändert von int(100) NOT NULL DEFAULT '0' nach int(16) unsigned NOT NULL DEFAULT '0'.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE TIMERS
+ MODIFY Id int(16) unsigned NOT NULL DEFAULT '0',
+ MODIFY NextEpgId int(16) unsigned NULL DEFAULT '0',
+ MODIFY AutotimerId int(16) unsigned NULL DEFAULT '0',
+ COMMENT='';
+#
+# Feldformate
+# TIMERS.Id geändert von int(11) NOT NULL DEFAULT '0' nach int(16) unsigned NOT NULL DEFAULT '0'.
+# TIMERS.NextEpgId geändert von int(11) NULL DEFAULT '0' nach int(16) unsigned NULL DEFAULT '0'.
+# TIMERS.AutotimerId geändert von int(11) NULL DEFAULT '0' nach int(16) unsigned NULL DEFAULT '0'.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+ALTER TABLE USER
+ ADD UserPrefs varchar(100) NULL DEFAULT '' AFTER Prefs,
+ ADD Deny set('tlist','alist','rlist','mlist','tedit','aedit','redit','remote','cedit') NULL DEFAULT NULL AFTER UserPrefs,
+ ADD MaxLifeTime int(2) NULL DEFAULT '0' AFTER Deny,
+ ADD MaxPriority int(2) NULL DEFAULT '0' AFTER MaxLifeTime,
+ MODIFY Id int(16) unsigned NOT NULL DEFAULT 0 auto_increment,
+ COMMENT='';
+#
+# Feldformat
+# USER.Id geändert von int(11) NOT NULL DEFAULT 0 auto_increment nach int(16) unsigned NOT NULL DEFAULT 0 auto_increment.
+# Eventuell müssen noch Daten angepaßt werden!
+#
+
+#
+# DDL ENDE
+#
+
+#
+# DML START
+#
+INSERT INTO VERSION (Version) VALUES ('12');
+
+REPLACE INTO VERSION (Version) VALUES ('12');
+
+#
+# DML ENDE
+#
+
+SET FOREIGN_KEY_CHECKS = 1;
Modified: vdr/vdr-xxv/trunk/debian/xxvd.cfg
===================================================================
--- vdr/vdr-xxv/trunk/debian/xxvd.cfg 2005-11-02 19:51:09 UTC (rev 1427)
+++ vdr/vdr-xxv/trunk/debian/xxvd.cfg 2005-11-03 00:30:09 UTC (rev 1428)
@@ -1,83 +1,4 @@
-[AUTOTIMER]
-interval=300
-
-[CHANNELS]
-empty=n
-file=/var/lib/vdr/channels.conf
-filterCA=0,1,2,3,4
-interval=300
-stripCH=short,long;provider
-
-[EPG]
-epgfile=/var/cache/vdr/epg.data
-interval=300
-restart=3
-timers=12:00,18:00,20:15,22:00,00:00
-
-[GRAB]
-file=/tmp/live.jpg
-interval=300
-xsize=432
-ysize=320
-
[General]
DSN=DBI:mysql:database=xxv;host=localhost;port=3306
PWD=
-USR=xpix
-
-[HTTPD]
-Clients=5
-HtmlRoot=default
-Port=8080
-
-[INTERFACE]
-Clients=5
-Port=8002
-
-[MUSIC]
-clients=5
-interval=500
-path=/music/MP3
-port=8100
-
-[RECORDS]
-commandfile=/var/lib/vdr/reccmds.conf
-interval=600
-mplayer=/usr/bin/mplayer
-mplayercommand=No MPlayer
-mplayerlog=/var/log/vdr-xxv/xxvd_mplayer.log
-vfat=y
-videodir=/var/lib/video.00
-
-[STATUS]
-dfBinary=/bin/df
-wcBinary=/usr/bin/wc
-whoBinary=/usr/bin/who
-
-[SVDRP]
-VdrHost=localhost
-VdrPort=2001
-
-[TELNET]
-Clients=5
-Port=8005
-
-[TIMERS]
-Lifetime=50
-Priority=50
-afterminutes=5
-file=/var/lib/vdr/timers.conf
-interval=300
-prevminutes=1
-
-[USER]
-Active=y
-
-[VTX]
-cache=legacy
-dir=/var/cache/vdr/vtx
-
-[WAPD]
-Clients=5
-Port=8085
-WMLRoot=wml
+USR=
More information about the pkg-vdr-dvb-changes
mailing list