r1600 - in vdr/vdradmin/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-12-08 15:33:28 +0000 (Thu, 08 Dec 2005)
New Revision: 1600

Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
Log:
vdradmin: Updated 03_cfgfiles-fhs to set good defaults for the paths to the epgimages, cfgdir and videodir

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2005-12-08 15:24:41 UTC (rev 1599)
+++ vdr/vdradmin/trunk/debian/changelog	2005-12-08 15:33:28 UTC (rev 1600)
@@ -6,6 +6,7 @@
     - New upstream release
       + Updated 01_dist-var.dpatch
       + Updated 02_sectmpfiles.dpatch
+      + Updated 03_cfgfiles-fhs.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu,  8 Dec 2005 16:24:06 +0100
 

Modified: vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch	2005-12-08 15:24:41 UTC (rev 1599)
+++ vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch	2005-12-08 15:33:28 UTC (rev 1600)
@@ -6,10 +6,23 @@
 ## DP: with the FHS (vdradmin changes these files at runtime)
 
 @DPATCH@
-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 @@
+diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.eh14eS/vdradmin-0.97-am3.4.2/vdradmind.pl
+--- vdradmin-0.97-am3.4.2/vdradmind.pl	2005-12-08 16:27:14.264423500 +0100
++++ /tmp/dpep.eh14eS/vdradmin-0.97-am3.4.2/vdradmind.pl	2005-12-08 16:28:30.929214750 +0100
+@@ -104,9 +104,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";
+@@ -195,12 +195,12 @@
  	$TEMPLATEDIR           = "/usr/share/vdradmin/template";
  	$LOGFILE               = "/var/log/$CONFIG{LOGFILE}";
  	$PIDFILE               = "/var/run/vdradmind.pid";