r7979 - in /vdr/vdr-plugin-cdda/trunk/debian: changelog control patches/00list patches/90_gcc-4.4.dpatch postrm

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

Author: tiber-guest
Date: Mon Oct 26 18:50:17 2009
New Revision: 7979

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7979
Log:
* Added gcc-4.4 fix
* Standards-Version: 3.8.3

Added:
    vdr/vdr-plugin-cdda/trunk/debian/patches/90_gcc-4.4.dpatch
Modified:
    vdr/vdr-plugin-cdda/trunk/debian/changelog
    vdr/vdr-plugin-cdda/trunk/debian/control
    vdr/vdr-plugin-cdda/trunk/debian/patches/00list
    vdr/vdr-plugin-cdda/trunk/debian/postrm

Modified: vdr/vdr-plugin-cdda/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/debian/changelog?rev=7979&op=diff
==============================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-cdda/trunk/debian/changelog Mon Oct 26 18:50:17 2009
@@ -1,3 +1,10 @@
+vdr-plugin-cdda (0.1.0-28) experimental; urgency=low
+
+  * Added gcc-4.4 fix
+  * Standards-Version: 3.8.3
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 26 Oct 2009 19:48:26 +0100
+
 vdr-plugin-cdda (0.1.0-27) experimental; urgency=low
 
   * Release for vdrdevel 1.7.6

Modified: vdr/vdr-plugin-cdda/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/debian/control?rev=7979&op=diff
==============================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/control (original)
+++ vdr/vdr-plugin-cdda/trunk/debian/control Mon Oct 26 18:50:17 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libcdio-dev (>= 0.76), libmad0-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/
 

Modified: vdr/vdr-plugin-cdda/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/debian/patches/00list?rev=7979&op=diff
==============================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/00list Mon Oct 26 18:50:17 2009
@@ -4,3 +4,4 @@
 
 90_APIVERSION.dpatch
 90_cdda-1.3.38
+90_gcc-4.4

Added: vdr/vdr-plugin-cdda/trunk/debian/patches/90_gcc-4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/debian/patches/90_gcc-4.4.dpatch?rev=7979&op=file
==============================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/90_gcc-4.4.dpatch (added)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/90_gcc-4.4.dpatch Mon Oct 26 18:50:17 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_gcc-4.4.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-cdda-0.1.0~/cdda_cddb.c vdr-plugin-cdda-0.1.0/cdda_cddb.c
+--- vdr-plugin-cdda-0.1.0~/cdda_cddb.c	2005-12-24 11:17:06.000000000 +0100
++++ vdr-plugin-cdda-0.1.0/cdda_cddb.c	2009-10-26 19:43:54.000000000 +0100
+@@ -58,7 +58,8 @@
+ 
+     sscanf(key, "%a[^\n0-9]%d", &p_key, &track);
+ 
+-    char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/');
++    char *p_value1 = NULL, *p_value2 = NULL;
++    const char *p_idx = index(value, '/');
+     if (NULL != p_idx && 0x20 == *(p_idx-1) && 0x20 == *(p_idx+1) && 0x00 != *(p_idx+2))
+       sscanf(value, "%a[^/] / %a[^/]", &p_value1, &p_value2);
+     else

Modified: vdr/vdr-plugin-cdda/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/debian/postrm?rev=7979&op=diff
==============================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/postrm (original)
+++ vdr/vdr-plugin-cdda/trunk/debian/postrm Mon Oct 26 18:50:17 2009
@@ -3,7 +3,7 @@
 
 # Remove cache files
 if [ "$1" = "purge" ]; then
-    /bin/rm -rf /var/cache/vdr-plugin-cdda/*
+    rm -rf /var/cache/vdr-plugin-cdda/*
 fi
 
 #DEBHELPER#