r4846 - in /vdr/vdr-plugin-mp3/trunk/debian: changelog patches/00list patches/01_mp3-ogg-conv-utf8.dpatch patches/03_mplayer.sh-websources.dpatch patches/11_mplayer.sh.conf-defaults.dpatch patches/91_mp3-vdr150.dpatch

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

Author: tom-guest
Date: Wed Jun 27 23:43:55 2007
New Revision: 4846

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

Removed:
    vdr/vdr-plugin-mp3/trunk/debian/patches/91_mp3-vdr150.dpatch
Modified:
    vdr/vdr-plugin-mp3/trunk/debian/changelog
    vdr/vdr-plugin-mp3/trunk/debian/patches/00list
    vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch
    vdr/vdr-plugin-mp3/trunk/debian/patches/03_mplayer.sh-websources.dpatch   (props changed)
    vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch   (props changed)

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/changelog?rev=4846&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Wed Jun 27 23:43:55 2007
@@ -1,3 +1,11 @@
+vdr-plugin-mp3 (0.10.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed 91_mp3-vdr150.dpatch
+  * Adapted 01_mp3-ogg-conv-utf8.dpatch to VDR >= 1.5.3
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 28 Jun 2007 00:01:12 +0200
+
 vdr-plugin-mp3 (0.9.15-14) unstable; urgency=low
 
   * allow webstreams in playlists for mplayer (closes: #427675)

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/00list?rev=4846&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list Wed Jun 27 23:43:55 2007
@@ -3,4 +3,3 @@
 03_mplayer.sh-websources
 10_debian-fhs-defaults
 11_mplayer.sh.conf-defaults
-91_mp3-vdr150

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch?rev=4846&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch Wed Jun 27 23:43:55 2007
@@ -1,14 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run 
 ## 01_mp3-ogg-conv-utf8.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/mp3-0.9.15-ogg-conv-utf8.diff
+## http://toms-cafe.de/vdr/download/mp3-0.10.0-ogg-conv-utf8.diff
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Converts ogginfos from utf8 to the setup charset.
 
 @DPATCH@
---- mp3-0.9.15/decoder-ogg.c
-+++ mp3-0.9.15/decoder-ogg.c
-@@ -28,6 +28,28 @@
+--- mp3-0.10.0/decoder-ogg.c
++++ mp3-0.10.0/decoder-ogg.c
+@@ -28,6 +28,32 @@
  #include "common.h"
  #include "decoder-ogg.h"
  
@@ -19,7 +19,11 @@
 +{
 +  if (!text) return NULL;
 +  char *buffer = strdup(text);
++#if APIVERSNUM >= 10503
++  iconv_t ic = iconv_open(cCharSetConv::SystemCharacterTable(), "UTF8");
++#else
 +  iconv_t ic = iconv_open(I18nCharSets()[Setup.OSDLanguage], "UTF8");
++#endif
 +  if (ic >= 0) {
 +     char *in = (char *)text;
 +     char *out = buffer;
@@ -37,7 +41,7 @@
  // --- cOggFile ----------------------------------------------------------------
  
  cOggFile::cOggFile(const char *Filename)
-@@ -166,13 +188,13 @@
+@@ -166,13 +192,13 @@
          const int len=p-cc;
          p++;
          if(!strncasecmp(cc,"TITLE",len)) {

Propchange: vdr/vdr-plugin-mp3/trunk/debian/patches/03_mplayer.sh-websources.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch
            ('svn:executable' removed)