r8427 - in /vdr/vdr-plugin-vcd/trunk/debian: changelog copyright patches/00list patches/91_vcd-0.9-fix-INCLUDES.dpatch rules

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

Author: tom-guest
Date: Thu Mar  4 22:53:12 2010
New Revision: 8427

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8427
Log:
* Added 91_vcd-0.9-fix-INCLUDES.dpatch
* Removed DVBDIR from debian/rules
* Updated debian/copyright

Added:
    vdr/vdr-plugin-vcd/trunk/debian/patches/91_vcd-0.9-fix-INCLUDES.dpatch
Modified:
    vdr/vdr-plugin-vcd/trunk/debian/changelog
    vdr/vdr-plugin-vcd/trunk/debian/copyright
    vdr/vdr-plugin-vcd/trunk/debian/patches/00list
    vdr/vdr-plugin-vcd/trunk/debian/rules

Modified: vdr/vdr-plugin-vcd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vcd/trunk/debian/changelog?rev=8427&op=diff
==============================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-vcd/trunk/debian/changelog Thu Mar  4 22:53:12 2010
@@ -1,3 +1,11 @@
+vdr-plugin-vcd (0.9-11) unstable; urgency=low
+
+  * Added 91_vcd-0.9-fix-INCLUDES.dpatch
+  * Removed DVBDIR from debian/rules
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 04 Mar 2010 17:03:12 +0100
+
 vdr-plugin-vcd (0.9-10) unstable; urgency=low
 
   * Removed non-standard shebang line from debian/rules (Closes: #552657)

Modified: vdr/vdr-plugin-vcd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vcd/trunk/debian/copyright?rev=8427&op=diff
==============================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-vcd/trunk/debian/copyright Thu Mar  4 22:53:12 2010
@@ -14,7 +14,7 @@
     (C) 2002 - 2008 Thomas Heiligenmann
 
 Copyright (Debian packaging):
-    (C) 2002 - 2009 Thomas Schmidt, Thomas Günther, Tobias Grimm
+    (C) 2002 - 2010 Thomas Schmidt, Thomas Günther, Tobias Grimm
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-vcd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vcd/trunk/debian/patches/00list?rev=8427&op=diff
==============================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-vcd/trunk/debian/patches/00list Thu Mar  4 22:53:12 2010
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 90_vcd-0.9-1.7.3
+91_vcd-0.9-fix-INCLUDES

Added: vdr/vdr-plugin-vcd/trunk/debian/patches/91_vcd-0.9-fix-INCLUDES.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vcd/trunk/debian/patches/91_vcd-0.9-fix-INCLUDES.dpatch?rev=8427&op=file
==============================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/patches/91_vcd-0.9-fix-INCLUDES.dpatch (added)
+++ vdr/vdr-plugin-vcd/trunk/debian/patches/91_vcd-0.9-fix-INCLUDES.dpatch Thu Mar  4 22:53:12 2010
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_vcd-0.9-fix-INCLUDES.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/vcd-0.9-fix-INCLUDES.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with VDR >= 1.7.13.
+
+ at DPATCH@
+--- vcd-0.9/Makefile
++++ vcd-0.9/Makefile
+@@ -47,7 +47,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE
+ 

Modified: vdr/vdr-plugin-vcd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-vcd/trunk/debian/rules?rev=8427&op=diff
==============================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/rules (original)
+++ vdr/vdr-plugin-vcd/trunk/debian/rules Thu Mar  4 22:53:12 2010
@@ -5,15 +5,14 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
 
 common-build-arch::
 	$(MAKE) all $(MAKE_OPTIONS)
 
-clean::
+cleanbuilddir::
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 
 common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/dependencies.sh
-