r8316 - in /vdr/vdradmin-am/trunk/debian: changelog patches/00list patches/07_fix-need-recoding-detection.dpatch patches/07_templates_utf8.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Thu Jan 14 19:58:42 2010
New Revision: 8316

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8316
Log:
Dropped 07_templates_utf8.dpatch and added 07_fix-need-recoding-detection
(Closes #561834) - This should fix the encoding problem and allow
ISO8859 as well as UTF-8 for VDR, while beeing able to choose a different
encoding for VDRAdmin

Added:
    vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch   (with props)
Removed:
    vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch
Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/patches/00list

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8316&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Thu Jan 14 19:58:42 2010
@@ -1,3 +1,12 @@
+vdradmin-am (3.6.5-3) UNRELEASED; urgency=low
+
+  * Dropped 07_templates_utf8.dpatch and added 07_fix-need-recoding-detection
+    (Closes #561834) - This should fix the encoding problem and allow
+    ISO8859 as well as UTF-8 for VDR, while beeing able to choose a different
+    encoding for VDRAdmin
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 14 Jan 2010 20:56:12 +0100
+
 vdradmin-am (3.6.5-2) UNRELEASED; urgency=low
 
   * Changed section to 'video'

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=8316&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Thu Jan 14 19:58:42 2010
@@ -3,4 +3,4 @@
 03_cfgfiles-fhs
 #04_manpage-fixes
 06_template-cache
-07_templates_utf8
+07_fix-need-recoding-detection

Added: vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch?rev=8316&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch Thu Jan 14 19:58:42 2010
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_fix-need-recoding-detection.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.6.5~/vdradmind vdradmin-am-3.6.5/vdradmind
+--- vdradmin-am-3.6.5~/vdradmind	2010-01-14 20:23:06.000000000 +0100
++++ vdradmin-am-3.6.5/vdradmind	2010-01-14 20:55:05.000000000 +0100
+@@ -6718,11 +6718,11 @@
+         $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*;/;
+         $VDRVERSION_HR = "$1.$2.$3";
+         $VDRVERSION    = ($1 * 10000 + $2 * 100 + $3);
+-        $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*; .*; (.*)\r|$/;
+-        $VDR_ENCODING = $4;
+-        $need_recode = ($can_use_encode and $VDR_ENCODING and $VDR_ENCODING ne $MY_ENCODING) ? 1 : 0;
+         getSupportedFeatures($this);
+     }
++    $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*; .*; (.*)\r|$/;
++    $VDR_ENCODING = $4;
++    $need_recode = ($can_use_encode and $VDR_ENCODING and $VDR_ENCODING ne $MY_ENCODING) ? 1 : 0;
+ }
+ 
+ sub getSupportedFeatures {

Propchange: vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch
------------------------------------------------------------------------------
    svn:executable = *