r8351 - in /vdr/vdr-plugin-mp3/trunk/debian: changelog patches/00list patches/01_mp3-ogg-conv-utf8.dpatch patches/10_debian-fhs-defaults.dpatch patches/12_gcc-4.4.dpatch patches/20_Makefile-fix.dpatch

Sat Jan 23 19:51:50 UTC 2010

Author: tiber-guest
Date: Sat Jan 23 19:51:42 2010
New Revision: 8351

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8351
Log:
* New upstream release
* Dropped 12_gcc-4.4.dpatch - fixed upstream
* Updated 10_debian-fhs-defaults.dpatch
* Dropped 01_mp3-ogg-conv-utf8.dpatch - fixed upstream
* Added 20_Makefile-fix.dpatch

Added:
    vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch
Removed:
    vdr/vdr-plugin-mp3/trunk/debian/patches/01_mp3-ogg-conv-utf8.dpatch
    vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch
Modified:
    vdr/vdr-plugin-mp3/trunk/debian/changelog
    vdr/vdr-plugin-mp3/trunk/debian/patches/00list
    vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch

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=8351&op=diff
==============================================================================

--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Sat Jan 23 19:51:42 2010
@@ -1,3 +1,13 @@
+vdr-plugin-mp3 (0.10.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Dropped 12_gcc-4.4.dpatch - fixed upstream
+  * Updated 10_debian-fhs-defaults.dpatch
+  * Dropped 01_mp3-ogg-conv-utf8.dpatch - fixed upstream
+  * Added 20_Makefile-fix.dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 23 Jan 2010 20:51:31 +0100
+
 vdr-plugin-mp3 (0.10.1-14) unstable; urgency=low
 
   * Added 12_gcc-4.4.dpatch

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=8351&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list Sat Jan 23 19:51:42 2010
@@ -1,3 +1,2 @@
-01_mp3-ogg-conv-utf8
 10_debian-fhs-defaults
-12_gcc-4.4
+20_Makefile-fix

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch?rev=8351&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch Sat Jan 23 19:51:42 2010
@@ -6,9 +6,9 @@
 ## DP: Change several default-paths for Debian FHS conformance
 
 @DPATCH@
-diff -urNad vdr-plugin-mp3-0.9.15~/data-mp3.c vdr-plugin-mp3-0.9.15/data-mp3.c
---- vdr-plugin-mp3-0.9.15~/data-mp3.c	2006-04-23 17:41:14.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data-mp3.c	2007-02-15 22:25:50.000000000 +0100
+diff -urNad vdr-plugin-mp3-0.10.2~/data-mp3.c vdr-plugin-mp3-0.10.2/data-mp3.c
+--- vdr-plugin-mp3-0.10.2~/data-mp3.c	2009-11-29 04:05:21.000000000 +0100
++++ vdr-plugin-mp3-0.10.2/data-mp3.c	2010-01-23 20:37:21.000000000 +0100
 @@ -36,8 +36,8 @@
  #define di(x) ; 
  #endif
@@ -17,13 +17,13 @@
 -const char *imageconv  = "image_convert.sh";
 +const char *imagecache = "/var/cache/vdr-plugin-mp3/images";
 +const char *imageconv  = "/usr/share/vdr-plugin-mp3/image_convert";
+ const char *def_usr_img = 0;
  
  // image suffixes to search
- const char *img_suff[] = { "jpg","png","gif",0 };
-diff -urNad vdr-plugin-mp3-0.9.15~/data.c vdr-plugin-mp3-0.9.15/data.c
---- vdr-plugin-mp3-0.9.15~/data.c	2006-05-16 19:31:09.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data.c	2007-02-15 22:25:50.000000000 +0100
-@@ -38,7 +38,7 @@
+diff -urNad vdr-plugin-mp3-0.10.2~/data.c vdr-plugin-mp3-0.10.2/data.c
+--- vdr-plugin-mp3-0.10.2~/data.c	2009-11-29 12:42:14.000000000 +0100
++++ vdr-plugin-mp3-0.10.2/data.c	2010-01-23 20:36:23.000000000 +0100
+@@ -39,7 +39,7 @@
  
  // ----------------------------------------------------------------
  
@@ -32,9 +32,9 @@
  
  char *Quote(const char *str)
  {
-diff -urNad vdr-plugin-mp3-0.9.15~/player-mplayer.c vdr-plugin-mp3-0.9.15/player-mplayer.c
---- vdr-plugin-mp3-0.9.15~/player-mplayer.c	2006-09-19 20:17:50.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/player-mplayer.c	2007-02-15 22:25:50.000000000 +0100
+diff -urNad vdr-plugin-mp3-0.10.2~/player-mplayer.c vdr-plugin-mp3-0.10.2/player-mplayer.c
+--- vdr-plugin-mp3-0.10.2~/player-mplayer.c	2009-10-14 00:18:18.000000000 +0200
++++ vdr-plugin-mp3-0.10.2/player-mplayer.c	2010-01-23 20:36:23.000000000 +0100
 @@ -47,7 +47,7 @@
  
  #define MPLAYER_VOL_STEP 3.0

Added: vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch?rev=8351&op=file
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch (added)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch Sat Jan 23 19:51:42 2010
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_Makefile-fix.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 vdr-plugin-mp3-0.10.2~/Makefile vdr-plugin-mp3-0.10.2/Makefile
+--- vdr-plugin-mp3-0.10.2~/Makefile	2009-11-13 12:28:19.000000000 +0100
++++ vdr-plugin-mp3-0.10.2/Makefile	2010-01-23 20:47:39.000000000 +0100
+@@ -80,13 +80,13 @@
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+-APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
++VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
++APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ ifeq ($(strip $(APIVERSION)),)
+    APIVERSION = $(VDRVERSION)
+ endif
+-VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+-APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
++VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
++APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
+ ifeq ($(strip $(APIVERSNUM)),)
+    APIVERSNUM = $(VDRVERSNUM)
+ endif
+@@ -154,7 +154,7 @@
+ I18Nmsgs  := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo),$(I18Npots)))
+ I18Nmsgs2 := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo2),$(I18Npots)))
+ 
+-HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(VDRDIR)/include/vdr/i18n.h)
++HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h)
+ ifeq ($(strip $(HASLOCALE)),)
+   COM_OBJS += i18n.o
+ endif


