r7994 - in /vdr/vdr-plugin-radio/trunk/debian: README.source changelog control patches/ patches/00list patches/01_gcc-4.4.dpatch rules

Sat Nov 7 21:26:09 UTC 2009

Author: tiber-guest
Date: Sat Nov  7 21:26:08 2009
New Revision: 7994

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7994
Log:
* Added GCC 4.4 patch
* Removed non-standard shebang line from debian/rules
* Added README.source

Added:
    vdr/vdr-plugin-radio/trunk/debian/README.source
    vdr/vdr-plugin-radio/trunk/debian/patches/
    vdr/vdr-plugin-radio/trunk/debian/patches/00list
    vdr/vdr-plugin-radio/trunk/debian/patches/01_gcc-4.4.dpatch
Modified:
    vdr/vdr-plugin-radio/trunk/debian/changelog
    vdr/vdr-plugin-radio/trunk/debian/control
    vdr/vdr-plugin-radio/trunk/debian/rules

Added: vdr/vdr-plugin-radio/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/README.source?rev=7994&op=file
==============================================================================

--- vdr/vdr-plugin-radio/trunk/debian/README.source (added)
+++ vdr/vdr-plugin-radio/trunk/debian/README.source Sat Nov  7 21:26:08 2009
@@ -1,0 +1,7 @@
+This package uses the dpatch system to save and apply patches to the
+upstream source code of the software that is packaged. For details
+about how to use dpatch read
+
+   /usr/share/doc/dpatch/README.source.gz
+
+from the dpatch package.

Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/changelog?rev=7994&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog Sat Nov  7 21:26:08 2009
@@ -1,3 +1,11 @@
+vdr-plugin-radio (0.2.5-2) experimental; urgency=low
+
+  * Added GCC 4.4 patch
+  * Removed non-standard shebang line from debian/rules
+  * Added README.source
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 07 Nov 2009 22:16:00 +0100
+
 vdr-plugin-radio (0.2.5-1) experimental; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-radio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/control?rev=7994&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/control (original)
+++ vdr/vdr-plugin-radio/trunk/debian/control Sat Nov  7 21:26:08 2009
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>, Thomas GÃ¼nther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/

Added: vdr/vdr-plugin-radio/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/patches/00list?rev=7994&op=file
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/00list Sat Nov  7 21:26:08 2009
@@ -1,0 +1,1 @@
+01_gcc-4.4

Added: vdr/vdr-plugin-radio/trunk/debian/patches/01_gcc-4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/patches/01_gcc-4.4.dpatch?rev=7994&op=file
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/01_gcc-4.4.dpatch (added)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/01_gcc-4.4.dpatch Sat Nov  7 21:26:08 2009
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc-4.4.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes GCC 4.4 issue, patch provided by zzam at vdrportal:
+## DP: http://www.vdrportal.de/board/thread.php?postid=836790#post836790
+
+ at DPATCH@
+diff -urNad vdr-plugin-radio-0.2.5~/radioepg.c vdr-plugin-radio-0.2.5/radioepg.c
+--- vdr-plugin-radio-0.2.5~/radioepg.c	2007-10-09 17:45:26.000000000 +0200
++++ vdr-plugin-radio-0.2.5/radioepg.c	2009-11-07 22:13:38.000000000 +0100
+@@ -12,7 +12,7 @@
+ int epg_premiere(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p;
++	const char *p;
+ 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], jahr[RT_MEL];
+ 	struct tm tm_store;
+ 
+@@ -143,7 +143,7 @@
+ int epg_kdg(const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p;
++	const char *p;
+ 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], komp[RT_MEL];
+ 	struct tm tm_store;
+ 
+@@ -240,7 +240,7 @@
+ int epg_unitymedia(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p1, *p2;
++	const char *p1, *p2;
+ 	char  titel[2*RT_MEL], artist[2*RT_MEL];
+ 	struct tm tm_store;
+ 

Modified: vdr/vdr-plugin-radio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/rules?rev=7994&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/rules (original)
+++ vdr/vdr-plugin-radio/trunk/debian/rules Sat Nov  7 21:26:08 2009
@@ -1,7 +1,7 @@
-#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
+#!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 


