r3749 - vdr/vdr-plugin-decruft/trunk/debian/patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-11-11 23:39:12 +0100 (Sat, 11 Nov 2006)
New Revision: 3749

Added:
   vdr/vdr-plugin-decruft/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-decruft/trunk/debian/patches/02_avoid-vdr-patch.dpatch
Removed:
   vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch
Modified:
   vdr/vdr-plugin-decruft/trunk/debian/patches/00list
Log:
forgot -fPIC patch

Modified: vdr/vdr-plugin-decruft/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/patches/00list	2006-11-11 22:17:06 UTC (rev 3748)
+++ vdr/vdr-plugin-decruft/trunk/debian/patches/00list	2006-11-11 22:39:12 UTC (rev 3749)
@@ -1 +1,2 @@
-01_avoid-vdr-patch
+01_Makefile-fPIC-fix
+02_avoid-vdr-patch

Added: vdr/vdr-plugin-decruft/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-11-11 22:17:06 UTC (rev 3748)
+++ vdr/vdr-plugin-decruft/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-11-11 22:39:12 UTC (rev 3749)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad vdr-plugin-decruft-0.0.4~/Makefile vdr-plugin-decruft-0.0.4/Makefile
+--- vdr-plugin-decruft-0.0.4~/Makefile	2005-02-20 19:34:01.000000000 +0100
++++ vdr-plugin-decruft-0.0.4/Makefile	2006-11-11 23:36:30.000000000 +0100
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -g
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -g
+ 
+ ### The directory environment:
+ 


Property changes on: vdr/vdr-plugin-decruft/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch	2006-11-11 22:17:06 UTC (rev 3748)
+++ vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch	2006-11-11 22:39:12 UTC (rev 3749)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_avoid-vdr-patch.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoids the need to patch VDR.
-
- at DPATCH@
-diff -urNad vdr-plugin-decruft-0.0.4~/cruft.c vdr-plugin-decruft-0.0.4/cruft.c
---- vdr-plugin-decruft-0.0.4~/cruft.c	2005-02-20 19:34:01.000000000 +0100
-+++ vdr-plugin-decruft-0.0.4/cruft.c	2006-11-11 21:57:24.000000000 +0100
-@@ -535,8 +535,10 @@
-         /* Not defined, so define it */
-         if ( !groupSep ) {
-             groupSep = new cChannel();
--            groupSep->SetName(settings->group_name,"","");
--            groupSep->SetGroupSep(true);
-+            char* groupSepString;
-+            asprintf(&groupSepString, ":%s", settings->group_name);
-+            groupSep->Parse(groupSepString);
-+            free(groupSepString);
-             Channels.Add(groupSep);
-         }
-         /* Move the channel to the end of the group */

Copied: vdr/vdr-plugin-decruft/trunk/debian/patches/02_avoid-vdr-patch.dpatch (from rev 3742, vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch)