r1437 - in vdr/vdr-xxv/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sat Nov 5 16:49:54 UTC 2005
Author: tiber-guest
Date: 2005-11-05 16:49:53 +0000 (Sat, 05 Nov 2005)
New Revision: 1437
Removed:
vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch
vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/patches/00list
vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
Log:
Some of the patches have become part of the upstream sources. Some settings are
now hidden from the user by setting the hidden-field instead of commenting
them out.
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-11-04 23:54:25 UTC (rev 1436)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-11-05 16:49:53 UTC (rev 1437)
@@ -1,4 +1,4 @@
-vdr-xxv (0.50+svn574-1) UNRELEASED; urgency=low
+vdr-xxv (0.50+svn581-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2005-11-04 23:54:25 UTC (rev 1436)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2005-11-05 16:49:53 UTC (rev 1437)
@@ -1,4 +1,2 @@
01_libpath
03_defaults
-04_static-paths
-05_pod-path
Modified: vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch 2005-11-04 23:54:25 UTC (rev 1436)
+++ vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch 2005-11-05 16:49:53 UTC (rev 1437)
@@ -1,68 +1,94 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_defaults.dpatch by Tobias Grimm <tg at e-tobi.net>
+## 04_static-paths.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.
+## DP: hard-code some paths, that most likely wil never be changed on a
+## DP: Debian system
@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 01:36:10.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 01:36:10.000000000 +0100
-@@ -63,7 +63,7 @@
+diff -urNad vdr-xxv-0.50+svn581~/lib/XXV/MODULES/LOGREAD.pm vdr-xxv-0.50+svn581/lib/XXV/MODULES/LOGREAD.pm
+--- vdr-xxv-0.50+svn581~/lib/XXV/MODULES/LOGREAD.pm 2005-10-08 19:41:46.000000000 +0200
++++ vdr-xxv-0.50+svn581/lib/XXV/MODULES/LOGREAD.pm 2005-11-05 17:36:29.000000000 +0100
+@@ -33,6 +33,7 @@
+ tail => {
+ description => sprintf(gettext("Path of command '%s'"),'tail'),
+ default => '/usr/bin/tail',
++ hidden => 'yes',
+ type => 'file',
+ required => gettext('This is required!'),
},
- HtmlRoot => {
- description => gettext('tmpl files and images for http server (useful for skins)'),
-- default => 'html',
-+ default => 'default',
- type => 'list',
+@@ -45,6 +46,7 @@
+ syslog => {
+ description => gettext('Path of syslog file?'),
+ default => '/var/log/syslog',
++ hidden => 'yes',
+ type => 'file',
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 01:36:10.000000000 +0100
-@@ -43,7 +43,7 @@
},
- videodir => {
- description => gettext('Directory, where vdr recordings are stored.'),
-- default => '/video',
-+ default => '/var/lib/video',
- type => 'dir',
+diff -urNad vdr-xxv-0.50+svn581~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.50+svn581/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.50+svn581~/lib/XXV/MODULES/RECORDS.pm 2005-11-05 00:02:43.000000000 +0100
++++ vdr-xxv-0.50+svn581/lib/XXV/MODULES/RECORDS.pm 2005-11-05 17:38:45.000000000 +0100
+@@ -67,7 +67,8 @@
+ },
+ previewlog => {
+ description => gettext('Log file of produce preview images.'),
+- default => '/var/log/xxvd_mplayer.log',
++ default => '/var/log/vdr-xxv/xxvd_preview.log',
++ hidden => 'yes',
+ type => 'file',
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 01:36:10.000000000 +0100
-@@ -28,7 +28,7 @@
+@@ -83,7 +84,8 @@
},
- commands => {
- description => gettext('The path to the commands.conf'),
-- default => '/video/commands.conf',
-+ default => '/var/lib/vdr/commands.conf',
- type => 'file',
+ previewimages => {
+ description => gettext('common directory for preview images'),
+- default => '/var/cache/xxv/preview',
++ default => '/var/cache/vdr-xxv/preview',
++ hidden => 'yes',
+ type => 'dir',
required => gettext('This is required!'),
},
-diff -urNad vdr-xxv-0.50+svn574~/lib/XXV/MODULES/VTX.pm vdr-xxv-0.50+svn574/lib/XXV/MODULES/VTX.pm
---- vdr-xxv-0.50+svn574~/lib/XXV/MODULES/VTX.pm 2005-10-19 19:06:00.000000000 +0200
-+++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/VTX.pm 2005-11-03 01:36:31.000000000 +0100
+diff -urNad vdr-xxv-0.50+svn581~/lib/XXV/MODULES/STATUS.pm vdr-xxv-0.50+svn581/lib/XXV/MODULES/STATUS.pm
+--- vdr-xxv-0.50+svn581~/lib/XXV/MODULES/STATUS.pm 2005-10-16 23:49:21.000000000 +0200
++++ vdr-xxv-0.50+svn581/lib/XXV/MODULES/STATUS.pm 2005-11-05 17:40:01.000000000 +0100
+@@ -33,18 +33,21 @@
+ whoBinary => {
+ description => sprintf(gettext("Path of command '%s'"),'who'),
+ default => "/usr/bin/who",
++ hidden => 'yes',
+ type => "file",
+ required => gettext('This is required!'),
+ },
+ wcBinary => {
+ description => sprintf(gettext("Path of command '%s'"),'wc'),
+ default => "/usr/bin/wc",
++ hidden => 'yes',
+ required => gettext('This is required!'),
+ type => "file",
+ },
+ dfBinary => {
+ description => sprintf(gettext("Path of command '%s'"),'df'),
+ default => "/bin/df",
++ hidden => 'yes',
+ required => gettext('This is required!'),
+ type => "file",
+ },
+diff -urNad vdr-xxv-0.50+svn581~/lib/XXV/MODULES/USER.pm vdr-xxv-0.50+svn581/lib/XXV/MODULES/USER.pm
+--- vdr-xxv-0.50+svn581~/lib/XXV/MODULES/USER.pm 2005-11-04 22:56:08.000000000 +0100
++++ vdr-xxv-0.50+svn581/lib/XXV/MODULES/USER.pm 2005-11-05 17:42:30.000000000 +0100
+@@ -62,7 +62,8 @@
+ },
+ tempimages => {
+ description => gettext('common directory for temporary images'),
+- default => '/var/cache/xxv/temp',
++ default => '/tmp/.vdr-xxv/images',
++ hidden => 'yes',
+ type => 'dir',
+ required => gettext('This is required!'),
+ },
+diff -urNad vdr-xxv-0.50+svn581~/lib/XXV/MODULES/VTX.pm vdr-xxv-0.50+svn581/lib/XXV/MODULES/VTX.pm
+--- vdr-xxv-0.50+svn581~/lib/XXV/MODULES/VTX.pm 2005-10-19 19:06:00.000000000 +0200
++++ vdr-xxv-0.50+svn581/lib/XXV/MODULES/VTX.pm 2005-11-05 17:43:07.000000000 +0100
@@ -27,7 +27,7 @@
},
dir => {
Deleted: vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch 2005-11-04 23:54:25 UTC (rev 1436)
+++ vdr/vdr-xxv/trunk/debian/patches/04_static-paths.dpatch 2005-11-05 16:49:53 UTC (rev 1437)
@@ -1,193 +0,0 @@
-#! /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-03 01:42:18.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-11-03 01:42:18.000000000 +0100
-+++ vdr-xxv-0.50+svn574/lib/XXV/MODULES/RECORDS.pm 2005-11-03 01:42:18.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-03 01:42:18.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-03 01:44:03.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} = "/tmp/.vdr-xxv/images";
- return $self;
- }
-
Deleted: vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch 2005-11-04 23:54:25 UTC (rev 1436)
+++ vdr/vdr-xxv/trunk/debian/patches/05_pod-path.dpatch 2005-11-05 16:49:53 UTC (rev 1437)
@@ -1,77 +0,0 @@
-#! /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);
-
More information about the pkg-vdr-dvb-changes
mailing list