r344 - in vdr/vdr-xxv/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-03-28 14:58:54 +0000 (Mon, 28 Mar 2005)
New Revision: 344

Added:
   vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch
Modified:
   vdr/vdr-xxv/trunk/debian/dirs
   vdr/vdr-xxv/trunk/debian/init
   vdr/vdr-xxv/trunk/debian/logrotate
   vdr/vdr-xxv/trunk/debian/patches/00list
   vdr/vdr-xxv/trunk/debian/postinst
   vdr/vdr-xxv/trunk/debian/xxvd.cfg
Log:
xxv: put log files in own subdirectory

Modified: vdr/vdr-xxv/trunk/debian/dirs
===================================================================
--- vdr/vdr-xxv/trunk/debian/dirs	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/dirs	2005-03-28 14:58:54 UTC (rev 344)
@@ -1,3 +1,4 @@
 var/lib/vdr-xxv
 var/cache/vdr-xxv/doc
 var/cache/vdr-xxv/preview
+var/log/vdr-xxv

Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/init	2005-03-28 14:58:54 UTC (rev 344)
@@ -38,7 +38,7 @@
 # Command line options for xxvd - you normally shouldn't touch this!
 #
 CONFIGFILE="/var/lib/vdr-xxv/xxvd.cfg"
-LOGFILE="/var/log/xxvd.log"
+LOGFILE="/var/log/vdr-xxv/xxvd.log"
 PIDFILE="/var/run/xxvd.pid"
 LOCALEDIR="/usr/share/locale/"
 MODULEDIR="/usr/share/perl5/vdr-xxv/XXV/MODULES/*.pm"

Modified: vdr/vdr-xxv/trunk/debian/logrotate
===================================================================
--- vdr/vdr-xxv/trunk/debian/logrotate	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/logrotate	2005-03-28 14:58:54 UTC (rev 344)
@@ -1,4 +1,4 @@
-/var/log/xxvd.log {
+/var/log/vdr-xxv/xxvd.log {
     daily
     missingok
     rotate 7
@@ -7,7 +7,7 @@
     notifempty
 }
 
-/var/log/xxvd_mplayer.log {
+/var/log/vdr-xxv/xxvd_mplayer.log {
     daily
     missingok
     rotate 2

Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/patches/00list	2005-03-28 14:58:54 UTC (rev 344)
@@ -1,3 +1,4 @@
 01_libpath
 02_secure-grab
 03_empty-pid-file
+04_mplayer-log

Added: vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/patches/04_mplayer-log.dpatch	2005-03-28 14:58:54 UTC (rev 344)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_mplayer-log.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hard-code mplayer log file path
+
+@DPATCH@
+diff -urNad vdr-xxv-0.20/lib/XXV/MODULES/RECORDS.pm /tmp/dpep.o9DAN3/vdr-xxv-0.20/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.20/lib/XXV/MODULES/RECORDS.pm	2005-02-23 13:40:50.000000000 +0100
++++ /tmp/dpep.o9DAN3/vdr-xxv-0.20/lib/XXV/MODULES/RECORDS.pm	2005-03-28 14:43:56.000000000 +0200
+@@ -61,11 +61,11 @@
+                 default     => 'old',
+                 required    => gettext("This is required!"),
+             },
+-            mplayerlog => {
+-                description => gettext('Logfile for mplayer'),
+-                default     => '/var/log/xxvd_mplayer.log',
+-                type        => 'string',
+-                required    => gettext("This is required!"),
++#            mplayerlog => {
++#                description => gettext('Logfile for mplayer'),
++#                default     => '/var/log/xxvd_mplayer.log',
++#                type        => 'string',
++#                required    => gettext("This is required!"),
+             },
+             vfat => {
+                 description => gettext('Set this if your filename encoded for vfat filesystems'),
+@@ -153,6 +153,7 @@
+         },
+     );
+ 
++    $self->{mplayerlog} = "/var/log/vdr-xxv/xxvd_mplayer.log";
+ 	return $self;
+ }
+ 

Modified: vdr/vdr-xxv/trunk/debian/postinst
===================================================================
--- vdr/vdr-xxv/trunk/debian/postinst	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/postinst	2005-03-28 14:58:54 UTC (rev 344)
@@ -194,6 +194,7 @@
         chown -R xxv:xxv /var/lib/vdr-xxv
         chown -R xxv:xxv /var/cache/vdr-xxv/doc
         chown -R xxv:xxv /var/cache/vdr-xxv/preview
+        chown -R xxv:xxv /var/log/vdr-xxv
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

Modified: vdr/vdr-xxv/trunk/debian/xxvd.cfg
===================================================================
--- vdr/vdr-xxv/trunk/debian/xxvd.cfg	2005-03-28 14:46:10 UTC (rev 343)
+++ vdr/vdr-xxv/trunk/debian/xxvd.cfg	2005-03-28 14:58:54 UTC (rev 344)
@@ -45,7 +45,7 @@
 interval=600
 mplayer=/usr/bin/mplayer
 mplayercommand=No MPlayer
-mplayerlog=/var/log/xxvd_mplayer.log
+mplayerlog=/var/log/vdr-xxv/xxvd_mplayer.log
 vfat=y
 videodir=/var/lib/video.00