r4912 - in /vdr/vdr-plugin-xineliboutput/trunk/debian: changelog control patches/00list patches/02_vdr-include-path.dpatch patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch

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

Author: tom-guest
Date: Wed Jun 27 23:51:14 2007
New Revision: 4912

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4912
Log:
Release for vdrdevel 1.5.5

Added:
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch
Modified:
    vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
    vdr/vdr-plugin-xineliboutput/trunk/debian/control
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
    vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_vdr-include-path.dpatch   (props changed)

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/changelog?rev=4912&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog Wed Jun 27 23:51:14 2007
@@ -1,3 +1,11 @@
+vdr-plugin-xineliboutput (1.0.0~rc2-2) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.5
+  * Added 90_xineliboutput-1.0.0rc2-1.5.3.dpatch
+  * Build-Depend on vdr-dev (>= 1.4.7-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 28 Jun 2007 00:43:09 +0200
+
 vdr-plugin-xineliboutput (1.0.0~rc2-1) unstable; urgency=low
 
   [ Thomas Schmidt ]

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/control?rev=4912&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control Wed Jun 27 23:51:14 2007
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.7-2), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list?rev=4912&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list Wed Jun 27 23:51:14 2007
@@ -1,2 +1,3 @@
 02_vdr-include-path
 10_nosignal
+90_xineliboutput-1.0.0rc2-1.5.3

Propchange: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_vdr-include-path.dpatch
            ('svn:executable' removed)

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch?rev=4912&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch Wed Jun 27 23:51:14 2007
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_xineliboutput-1.0.0rc2-1.5.3.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/xineliboutput-1.0.0rc2-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+ at DPATCH@
+--- xineliboutput-1.0.0~rc2/tools/iconv.h
++++ xineliboutput-1.0.0~rc2/tools/iconv.h
+@@ -40,7 +40,11 @@ cIConv::cIConv(const char *SrcCharset, c
+   if(!SrcCharset)
+     SrcCharset = "UTF-8";
+   if(!DstCharset)
++#if APIVERSNUM >= 10503
++    DstCharset = cCharSetConv::SystemCharacterTable();
++#else
+     DstCharset = I18nCharSets()[Setup.OSDLanguage];
++#endif
+ 
+   m_ic = iconv_open(DstCharset, SrcCharset);
+