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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-12-08 15:24:41 +0000 (Thu, 08 Dec 2005)
New Revision: 1599

Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
   vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
Log:
vdradmin: New upstream release 0.97-am3.4.2

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2005-12-08 15:09:01 UTC (rev 1598)
+++ vdr/vdradmin/trunk/debian/changelog	2005-12-08 15:24:41 UTC (rev 1599)
@@ -1,12 +1,21 @@
-vdradmin (0.97-am3.3-1) unstable; urgency=low
+vdradmin (0.97-am3.4.2-1) unstable; urgency=low
 
   * NOT RELEASED YET
   
   * Thomas Schmidt <tschmidt at debian.org>
-    - New upstream version, now we use the modified vdradmin version 
+    - New upstream release
+      + Updated 01_dist-var.dpatch
+      + Updated 02_sectmpfiles.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu,  8 Dec 2005 16:24:06 +0100
+
+vdradmin (0.97-am3.3-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream version, we now use the modified vdradmin version 
       from Andreas Mair <mail at andreas.vdr-developer.org>, as the 
-      original upstream decided to stop distributing independant version of
-      vdradmin - new versions will be distributed bundled with linvdr only. 
+      original upstream decided to stop distributing independant versions of
+      vdradmin - new versions will be distributed bundled with linvdr only.
       Thanks to Tobias Grimm for creating the inofficial vdradmin-am package, 
       where most of the debian specific changes in this updated come from.
       + Updated 01_dist-var.dpatch

Modified: vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch	2005-12-08 15:09:01 UTC (rev 1598)
+++ vdr/vdradmin/trunk/debian/patches/01_dist-var.dpatch	2005-12-08 15:24:41 UTC (rev 1599)
@@ -7,15 +7,15 @@
 ## DP: instead of local, relative paths
 
 @DPATCH@
-diff -urNad vdradmin-am/vdradmind.pl /tmp/dpep.zu6cYX/vdradmin-am/vdradmind.pl
---- vdradmin-am/vdradmind.pl	2005-05-13 20:53:21.000000000 +0200
-+++ /tmp/dpep.zu6cYX/vdradmin-am/vdradmind.pl	2005-05-13 20:54:34.000000000 +0200
-@@ -55,7 +55,7 @@
+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;
  #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)_";
  
- sub true           () { 1 };
- sub false          () { 0 };

Modified: vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2005-12-08 15:09:01 UTC (rev 1598)
+++ vdr/vdradmin/trunk/debian/patches/02_sectmpfiles.dpatch	2005-12-08 15:24:41 UTC (rev 1599)
@@ -5,27 +5,25 @@
 ## DP: Use File::Temp to create temporary files in a secure way
 
 @DPATCH@
-diff -urNad vdradmin-am/vdradmind.pl /tmp/dpep.qsarK3/vdradmin-am/vdradmind.pl
---- vdradmin-am/vdradmind.pl	2005-05-13 20:57:30.000000000 +0200
-+++ /tmp/dpep.qsarK3/vdradmin-am/vdradmind.pl	2005-05-13 20:57:31.000000000 +0200
-@@ -4049,7 +4049,15 @@
+diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.oWSsKj/vdradmin-0.97-am3.4.2/vdradmind.pl
+--- vdradmin-0.97-am3.4.2/vdradmind.pl	2005-12-08 15:52:30.500358500 +0100
++++ /tmp/dpep.oWSsKj/vdradmin-0.97-am3.4.2/vdradmind.pl	2005-12-08 15:55:12.106458250 +0100
+@@ -4569,7 +4569,13 @@
  #############################################################################
  sub grab_picture {
  	my $size = $q->param("size");
--	my $file = new File::Temp("vdr-XXXXX", UNLINK => 1, SUFFIX => ".jpg");
-+
-+	my $file;
-+
-+	if (! $ENV{TEMPDIR} == "") {
-+	   $file = "$ENV{TEMPDIR}/vdradmin.$$.jpg";
-+	} else {
-+	   $file = new File::Temp(UNLINK => 1, SUFFIX => '.jpg');
-+	}
-+
+-	my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
++ 	my $file;
++ 
++ 	if (! $ENV{TEMPDIR} == "") {
++ 	   $file = "$ENV{TEMPDIR}/vdradmin.$$.jpg";
++        } else {
++           $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
++        }
+ 	chmod 0666,$file;
  	my $maxwidth = 768;
  	my $maxheight = 576;
- 	my($width, $height);
-@@ -4066,7 +4074,9 @@
+@@ -4587,7 +4593,9 @@
  	SendCMD("grab $file jpeg 70 $width $height");
  	#SendCMD("grab $file jpeg");
  	if(-e $file && -r $file) {