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

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-12 18:17:06 +0000 (Sun, 12 Mar 2006)
New Revision: 2005

Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
   vdr/vdradmin/trunk/debian/vdradmin-am.install
Log:
vdradmin: New upstream release 3.4.4beta; Fixed #356402

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2006-03-12 18:09:35 UTC (rev 2004)
+++ vdr/vdradmin/trunk/debian/changelog	2006-03-12 18:17:06 UTC (rev 2005)
@@ -1,9 +1,20 @@
-vdradmin-am (3.4.3-1) unstable; urgency=low
+vdradmin-am (3.4.3+3.4.4beta-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+      + Added convert.pl to /usr/share/vdradmin/ to convert old timers.conf
+        files to the new format of vdr>=1.3.44
+    - Updated 02_sectmpfiles.dpatch to change the path of the temporary
+      template dir to a safe location too (closes: #356402)
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 12 Mar 2006 18:48:44 +0100
+
+vdradmin-am (3.4.3-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
       + Removed dependancy to sendemail
       + Depend on libnet-perl
       + Removed 02_grab_over_svdrp.dpatch

Modified: vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2006-03-12 18:09:35 UTC (rev 2004)
+++ vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2006-03-12 18:17:06 UTC (rev 2005)
@@ -8,11 +8,34 @@
 ## DP: >=1.3.38, keeping it for compatibility with older vdr versions)
 
 @DPATCH@
-diff -urNad vdradmin-am-3.4.3/vdradmind.pl /tmp/dpep.AVdZf3/vdradmin-am-3.4.3/vdradmind.pl
---- vdradmin-am-3.4.3/vdradmind.pl	2006-03-02 17:01:45.425105250 +0100
-+++ /tmp/dpep.AVdZf3/vdradmin-am-3.4.3/vdradmind.pl	2006-03-02 17:07:37.279094750 +0100
-@@ -4725,11 +4725,18 @@
+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");

Modified: vdr/vdradmin/trunk/debian/vdradmin-am.install
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin-am.install	2006-03-12 18:09:35 UTC (rev 2004)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.install	2006-03-12 18:17:06 UTC (rev 2005)
@@ -1,5 +1,6 @@
 locale/                  usr/share/
 template/                usr/share/vdradmin/
+convert.pl               usr/share/vdradmin/
 vdradmind.pl             usr/bin/
 
 debian/vdradmind.pl.1    usr/share/man/man1/