r8474 - in /vdr/vdr-plugin-live/trunk/debian: changelog patches/00list patches/03_live-0.2.0-fix-INCLUDES.dpatch

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

Author: tom-guest
Date: Mon Mar 15 16:29:17 2010
New Revision: 8474

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8474
Log:
Added 03_live-0.2.0-fix-INCLUDES.dpatch

Added:
    vdr/vdr-plugin-live/trunk/debian/patches/03_live-0.2.0-fix-INCLUDES.dpatch
Modified:
    vdr/vdr-plugin-live/trunk/debian/changelog
    vdr/vdr-plugin-live/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-live/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/changelog?rev=8474&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-live/trunk/debian/changelog Mon Mar 15 16:29:17 2010
@@ -1,3 +1,9 @@
+vdr-plugin-live (0.2.0-8) unstable; urgency=low
+
+  * Added 03_live-0.2.0-fix-INCLUDES.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 14 Mar 2010 20:58:48 +0100
+
 vdr-plugin-live (0.2.0-7) unstable; urgency=low
 
   [ Tobias Grimm ]

Modified: vdr/vdr-plugin-live/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/00list?rev=8474&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-live/trunk/debian/patches/00list Mon Mar 15 16:29:17 2010
@@ -1,2 +1,3 @@
 01_ipv6
 02_timers_colon
+03_live-0.2.0-fix-INCLUDES

Added: vdr/vdr-plugin-live/trunk/debian/patches/03_live-0.2.0-fix-INCLUDES.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/03_live-0.2.0-fix-INCLUDES.dpatch?rev=8474&op=file
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/03_live-0.2.0-fix-INCLUDES.dpatch (added)
+++ vdr/vdr-plugin-live/trunk/debian/patches/03_live-0.2.0-fix-INCLUDES.dpatch Mon Mar 15 16:29:17 2010
@@ -1,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with VDR >= 1.7.13.
+
+ at DPATCH@
+--- live-0.2.0/Makefile
++++ live-0.2.0/Makefile
+@@ -38,6 +38,7 @@
+ ### Allow user defined options to overwrite defaults:
+ 
+ -include $(VDRDIR)/Make.config
++EXTRA_INCLUDES = $(INCLUDES)
+ 
+ ### The version number of VDR's plugin API (taken from VDR's "config.h"):
+ 
+@@ -139,10 +140,10 @@
+ subdirs: $(SUBDIRS)
+ 
+ $(SUBDIRS):
+-	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
++	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS)
+ 
+ PAGES:
+-	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
++	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies
+ 
+ $(VERSIONSUFFIX): FORCE
+ 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
+--- live-0.2.0/css/Makefile
++++ live-0.2.0/css/Makefile
+@@ -7,6 +7,7 @@
+ CXXFLAGS += `tntnet-config --cxxflags`
+ LDFLAGS  += `tntnet-config --libs`
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I..
+ 
+ ### The directory environment:
+--- live-0.2.0/httpd/Makefile
++++ live-0.2.0/httpd/Makefile
+@@ -7,6 +7,7 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.
+ 
+ ### The object files (add further files here):
+--- live-0.2.0/javascript/Makefile
++++ live-0.2.0/javascript/Makefile
+@@ -7,6 +7,7 @@
+ CXXFLAGS += `tntnet-config --cxxflags`
+ LDFLAGS  += `tntnet-config --libs`
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.. -I$(VDRDIR)/include
+ 
+ ### The directory environment:
+--- live-0.2.0/pages/Makefile
++++ live-0.2.0/pages/Makefile
+@@ -2,6 +2,7 @@
+ AR       ?= ar
+ ECPPC    ?= ecppc
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.. -I$(VDRDIR)/include
+ 
+ ### The directory environment: