r2778 - in vdr/vdradmin-am/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Sun May 14 20:12:44 UTC 2006
Author: tschmidt
Date: 2006-05-14 20:12:39 +0000 (Sun, 14 May 2006)
New Revision: 2778
Removed:
vdr/vdradmin-am/trunk/debian/patches/02_sectmpfiles.dpatch
Modified:
vdr/vdradmin-am/trunk/debian/changelog
vdr/vdradmin-am/trunk/debian/patches/00list
vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch
vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
vdr/vdradmin-am/trunk/debian/patches/04_epg_filename.dpatch
vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch
vdr/vdradmin-am/trunk/debian/vdradmin-am.default
vdr/vdradmin-am/trunk/debian/vdradmin-am.init
Log:
vdradmin-am: New Upstream release 3.4.5; added configurable nice-value to /etc/default/vdradmin-am
Modified: vdr/vdradmin-am/trunk/debian/changelog
===================================================================
--- vdr/vdradmin-am/trunk/debian/changelog 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/changelog 2006-05-14 20:12:39 UTC (rev 2778)
@@ -1,3 +1,17 @@
+vdradmin-am (3.4.5-1) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ + Updated 01_dist-var.dpatch
+ + Removed 02_sectmpfiles.dpatch - not needed anymore
+ + Updated 03_cfgfiles-fhs.dpatch
+ + Updated 04_epg_filename.dpatch
+ + Updated 05_ipv6-support.dpatch
+ - Make nice-value whch vdradmin-am uses to run configurable in
+ /etc/default/vdradmin-am (defaults to 10)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 14 May 2006 11:40:14 +0200
+
vdradmin-am (3.4.4-1) unstable; urgency=low
* Thomas Schmidt <tschmidt at debian.org>
Modified: vdr/vdradmin-am/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/00list 2006-05-14 20:12:39 UTC (rev 2778)
@@ -1,5 +1,4 @@
01_dist-var
-02_sectmpfiles
03_cfgfiles-fhs
04_epg_filename
05_ipv6-support.dpatch
Modified: vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch 2006-05-14 20:12:39 UTC (rev 2778)
@@ -7,15 +7,15 @@
## DP: instead of local, relative paths
@DPATCH@
-diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.Wk6Ae7/vdradmin-0.97-am3.4.2/vdradmind.pl
---- vdradmin-0.97-am3.4.2/vdradmind.pl 2005-12-08 15:41:49.612305500 +0100
-+++ /tmp/dpep.Wk6Ae7/vdradmin-0.97-am3.4.2/vdradmind.pl 2005-12-08 15:42:20.686247500 +0100
-@@ -73,7 +73,7 @@
- use strict;
+diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.ADlxNb/vdradmin-am-3.4.5/vdradmind.pl
+--- vdradmin-am-3.4.5/vdradmind.pl 2006-05-09 15:09:37.000000000 +0200
++++ /tmp/dpep.ADlxNb/vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 12:20:09.395714750 +0200
+@@ -81,7 +81,7 @@
+
#use warnings;
--my $SEARCH_FILES_IN_SYSTEM = 0;
-+my $SEARCH_FILES_IN_SYSTEM = 1;
- my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value
- my $SUPPORTED_LOCALE_PREFIXES = "^(de|en|es|fi|fr)_";
+-my $SEARCH_FILES_IN_SYSTEM = 0;
++my $SEARCH_FILES_IN_SYSTEM = 1;
+ my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value
+ my $SUPPORTED_LOCALE_PREFIXES = "^(de|en|es|fi|fr|nl|ru)_";
Deleted: vdr/vdradmin-am/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/02_sectmpfiles.dpatch 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/02_sectmpfiles.dpatch 2006-05-14 20:12:39 UTC (rev 2778)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 02_sectmpfiles.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: lets vdr save the screenshots in a predefined temporary directory,
-## DP: which is created by vdradmin's init-script (not needed with vdr
-## DP: >=1.3.38, keeping it for compatibility with older vdr versions)
-
- at DPATCH@
-diff -urNad vdradmin-am-3.4.3/vdradmind.pl /tmp/dpep.emIhGY/vdradmin-am-3.4.3/vdradmind.pl
---- vdradmin-am-3.4.3/vdradmind.pl 2006-03-12 15:51:05.805026000 +0100
-+++ /tmp/dpep.emIhGY/vdradmin-am-3.4.3/vdradmind.pl 2006-03-12 15:55:15.996662000 +0100
-@@ -213,6 +213,13 @@
-
- textdomain("vdradmin");
-
-+my $TMPDIR;
-+if (! $ENV{TEMPDIR} == "" ) {
-+ $TMPDIR = $ENV{TEMPDIR}, # Tuning for Templates
-+} else {
-+ $TMPDIR = '/tmp'
-+}
-+
- #use Template::Constants qw( :debug );
- # IMHO a better Template Modul ;-)
- # some useful options (see below for full list)
-@@ -226,7 +233,7 @@
- EVAL_PERL => 1, # evaluate Perl code blocks
- CACHE_SIZE => 10000, # Tuning for Templates
- COMPILE_EXT => 'cache', # Tuning for Templates
-- COMPILE_DIR => '/tmp', # Tuning for Templates
-+ COMPILE_DIR => $TMPDIR, # Tuning for Templates
- # DEBUG => DEBUG_ALL,
- };
-
-@@ -4725,11 +4732,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";
Modified: vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2006-05-14 20:12:39 UTC (rev 2778)
@@ -6,41 +6,42 @@
## DP: with the FHS (vdradmin changes these files at runtime)
@DPATCH@
-diff -urNad vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl /tmp/dpep.YLYoja/vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl
---- vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl 2006-03-13 20:39:52.620545750 +0100
-+++ /tmp/dpep.YLYoja/vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl 2006-03-13 20:41:16.669798500 +0100
-@@ -110,9 +110,9 @@
- $CONFIG{SERVERHOST} = "0.0.0.0";
- $CONFIG{SERVERPORT} = 8001;
- $CONFIG{LOCAL_NET} = "0.0.0.0/32";
--$CONFIG{VIDEODIR} = "/video";
--$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
--$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages";
-+$CONFIG{VIDEODIR} = "/var/lib/video";
-+$CONFIG{VDRCONFDIR} = "/var/lib/vdr";
-+$CONFIG{EPGIMAGES} = "/var/cache/vdr/epgimages";
- $CONFIG{VDRVFAT} = 1;
+diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.mLrIzJ/vdradmin-am-3.4.5/vdradmind.pl
+--- vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 20:08:55.455513500 +0200
++++ /tmp/dpep.mLrIzJ/vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 21:56:11.128785750 +0200
+@@ -117,9 +117,9 @@
+ $CONFIG{SERVERHOST} = "0.0.0.0";
+ $CONFIG{SERVERPORT} = 8001;
+ $CONFIG{LOCAL_NET} = "0.0.0.0/32";
+-$CONFIG{VIDEODIR} = "/video";
+-$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
+-$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages";
++$CONFIG{VIDEODIR} = "/var/lib/video";
++$CONFIG{VDRCONFDIR} = "/var/lib/vdr";
++$CONFIG{EPGIMAGES} = "/var/cache/vdr/epgimages";
+ $CONFIG{VDRVFAT} = 1;
+
#
- $CONFIG{TEMPLATE} = "default";
-@@ -202,15 +202,15 @@
- bindtextdomain("vdradmin", "${BASENAME}locale");
+@@ -221,15 +221,15 @@
+ bindtextdomain("vdradmin", "${BASENAME}locale");
} else {
- $ETCDIR = "/etc/vdradmin";
-- $TEMPLATEDIR = "/usr/share/vdradmin/template";
-+ $TEMPLATEDIR = "/usr/share/vdradmin-am/template";
- $LOGFILE = "/var/log/$CONFIG{LOGFILE}";
- $PIDFILE = "/var/run/vdradmind.pid";
-- $CONFFILE = "${ETCDIR}/vdradmind.conf";
-- $AT_FILENAME = "${ETCDIR}/vdradmind.at";
-- $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
-- $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
-+ $CONFFILE = "/var/lib/vdradmin-am/vdradmind.conf";
-+ $AT_FILENAME = "/var/lib/vdradmin-am/vdradmind.at";
-+ $DONE_FILENAME = "/var/lib/vdradmin-am/vdradmind.done";
-+ $BL_FILENAME = "/var/lib/vdradmin-am/vdradmind.bl";
- $USER_CSS = "${ETCDIR}/user.css";
-- bindtextdomain("vdradmin", "/usr/share/locale");
-+# bindtextdomain("vdradmin", "/usr/share/locale");
+ $ETCDIR = "/etc/vdradmin";
+- $TEMPLATEDIR = "/usr/share/vdradmin/template";
++ $TEMPLATEDIR = "/usr/share/vdradmin-am/template";
+ $LOGFILE = "/var/log/$CONFIG{LOGFILE}";
+ $PIDFILE = "/var/run/vdradmind.pid";
+- $CONFFILE = "${ETCDIR}/vdradmind.conf";
+- $AT_FILENAME = "${ETCDIR}/vdradmind.at";
+- $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
+- $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
+- $USER_CSS = "${ETCDIR}/user.css";
+- bindtextdomain("vdradmin", "/usr/share/locale");
++ $CONFFILE = "/var/lib/vdradmin-am/vdradmind.conf";
++ $AT_FILENAME = "/var/lib/vdradmin-am/vdradmind.at";
++ $DONE_FILENAME = "/var/lib/vdradmin-am/vdradmind.done";
++ $BL_FILENAME = "/var/lib/vdradmin-am/vdradmind.bl";
++ $USER_CSS = "/var/lib/vdradmin-am/user.css";
++ #bindtextdomain("vdradmin", "/usr/share/locale");
}
- my $DONE = &DONE_Read || {};
+ my $DONE = &DONE_Read || {};
Modified: vdr/vdradmin-am/trunk/debian/patches/04_epg_filename.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/04_epg_filename.dpatch 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/04_epg_filename.dpatch 2006-05-14 20:12:39 UTC (rev 2778)
@@ -5,15 +5,15 @@
## DP: Fixes default path to epg.data file.
@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} = "";
+diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.iK7PLU/vdradmin-am-3.4.5/vdradmind.pl
+--- vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 21:59:33.677444250 +0200
++++ /tmp/dpep.iK7PLU/vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 22:00:34.209227250 +0200
+@@ -169,7 +169,7 @@
+
#
- $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} = "";
+ $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} = "";
Modified: vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch 2006-05-14 20:12:39 UTC (rev 2778)
@@ -6,9 +6,9 @@
## DP: Adds IPV6-Support to the webinterface (closes: #351764)
@DPATCH@
-diff -urNad vdradmin-am-3.4.3/vdradmind.pl /tmp/dpep.usF1vX/vdradmin-am-3.4.3/vdradmind.pl
---- vdradmin-am-3.4.3/vdradmind.pl 2006-03-02 08:38:25.000000000 +0100
-+++ /tmp/dpep.usF1vX/vdradmin-am-3.4.3/vdradmind.pl 2006-03-05 00:01:44.681279000 +0100
+diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.MOnIXb/vdradmin-am-3.4.5/vdradmind.pl
+--- vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 22:04:38.028465000 +0200
++++ /tmp/dpep.MOnIXb/vdradmin-am-3.4.5/vdradmind.pl 2006-05-14 22:06:03.881830500 +0200
@@ -55,6 +55,7 @@
use Env qw(@PATH LANGUAGE);
use CGI qw(:no_debug);
@@ -17,12 +17,12 @@
use HTML::Template::Expr();
use Template;
use Time::Local qw(timelocal);
-@@ -361,7 +362,7 @@
- my @reccmds;
- loadRecCmds();
+@@ -389,7 +390,7 @@
+ my @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf");
--my($Socket) = IO::Socket::INET->new(
-+my($Socket) = IO::Socket::INET6->new(
- Proto => 'tcp',
- LocalPort => $CONFIG{SERVERPORT},
- LocalAddr => $CONFIG{SERVERHOST},
+ my ($Socket) =
+- IO::Socket::INET->new(Proto => 'tcp',
++ IO::Socket::INET6->new(Proto => 'tcp',
+ LocalPort => $CONFIG{SERVERPORT},
+ LocalAddr => $CONFIG{SERVERHOST},
+ Listen => 10,
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.default
===================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.default 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.default 2006-05-14 20:12:39 UTC (rev 2778)
@@ -16,5 +16,8 @@
ENABLED="0"
+# Nicevalue to use when running vdradmin-am
+NICE="10"
+
# Additional options that are passed to the Daemon.
DAEMON_OPTS=""
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.init
===================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init 2006-05-14 09:38:25 UTC (rev 2777)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init 2006-05-14 20:12:39 UTC (rev 2778)
@@ -16,6 +16,7 @@
NAME=vdradmin
DESC="VDR Webadministration interface"
PIDFILE=/var/run/vdradmin.pid
+NICE="10"
test -x $DAEMON || exit 0
@@ -70,7 +71,7 @@
create_temp
create_logfile
LANG=$LANG TEMPDIR=$TEMPDIR start-stop-daemon --start \
- -c $USER:$GROUP -b -m --pidfile $PIDFILE \
+ -c $USER:$GROUP -b -m --nicelevel $NICE --pidfile $PIDFILE \
--exec /usr/bin/vdradmind.pl -- -nf
echo "$NAME."
else
More information about the pkg-vdr-dvb-changes
mailing list