r3585 - in vdr/vdradmin-am/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-10-22 20:07:51 +0000 (Sun, 22 Oct 2006)
New Revision: 3585

Added:
   vdr/vdradmin-am/trunk/debian/dirs
   vdr/vdradmin-am/trunk/debian/patches/06_template-cache.dpatch
Modified:
   vdr/vdradmin-am/trunk/debian/changelog
   vdr/vdradmin-am/trunk/debian/patches/00list
   vdr/vdradmin-am/trunk/debian/postinst
Log:
Made /var/cache/vdradmin-am the cache directory for compiled templates
(closes #394737)


Modified: vdr/vdradmin-am/trunk/debian/changelog
===================================================================
--- vdr/vdradmin-am/trunk/debian/changelog	2006-10-22 11:30:02 UTC (rev 3584)
+++ vdr/vdradmin-am/trunk/debian/changelog	2006-10-22 20:07:51 UTC (rev 3585)
@@ -1,3 +1,9 @@
+vdradmin-am (3.4.7-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 30 Sep 2006 14:36:46 +0200
+
 vdradmin-am (3.4.7-1) unstable; urgency=low
 
   * New upstream release

Added: vdr/vdradmin-am/trunk/debian/dirs
===================================================================
--- vdr/vdradmin-am/trunk/debian/dirs	                        (rev 0)
+++ vdr/vdradmin-am/trunk/debian/dirs	2006-10-22 20:07:51 UTC (rev 3585)
@@ -0,0 +1 @@
+var/cache/vdradmin-am

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list	2006-10-22 11:30:02 UTC (rev 3584)
+++ vdr/vdradmin-am/trunk/debian/patches/00list	2006-10-22 20:07:51 UTC (rev 3585)
@@ -2,3 +2,4 @@
 03_cfgfiles-fhs
 04_epg_filename
 05_ipv6-support
+06_template-cache

Added: vdr/vdradmin-am/trunk/debian/patches/06_template-cache.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/06_template-cache.dpatch	                        (rev 0)
+++ vdr/vdradmin-am/trunk/debian/patches/06_template-cache.dpatch	2006-10-22 20:07:51 UTC (rev 3585)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_template-cache.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put compiled templates for caching in /var/cache/vdradmin-am
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.4.7~/vdradmind.pl vdradmin-am-3.4.7/vdradmind.pl
+--- vdradmin-am-3.4.7~/vdradmind.pl	2006-10-22 21:58:22.000000000 +0200
++++ vdradmin-am-3.4.7/vdradmind.pl	2006-10-22 21:59:45.000000000 +0200
+@@ -284,7 +284,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  => '/var/cache/vdradmin-am',          # Tuning for Templates
+     VARIABLES    => $Xtemplate_vars,
+ 
+     #DEBUG        => DEBUG_ALL,

Modified: vdr/vdradmin-am/trunk/debian/postinst
===================================================================
--- vdr/vdradmin-am/trunk/debian/postinst	2006-10-22 11:30:02 UTC (rev 3584)
+++ vdr/vdradmin-am/trunk/debian/postinst	2006-10-22 20:07:51 UTC (rev 3585)
@@ -75,5 +75,8 @@
         [ -e $CFGFILE ] && chmod a=,u=rw,g=r $CFGFILE
     fi
 fi
+
+# ensure that vdradmin's template cache has the correct owner
+[ ! -d /var/cache/vdradmin-am ] || chown -R $USER:$GROUP /var/cache/vdradmin-am/
 	
 ##DEBHELPER##