r8495 - in /vdr/vdr-plugin-wirbelscan/trunk/debian: changelog control patches/ patches/01_kernel-header-include-fix.dpatch rules

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

Author: tom-guest
Date: Sun Mar 21 11:53:09 2010
New Revision: 8495

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8495
Log:
Fixed problems with DVB kernel headers (lenny/amd64)

Added:
    vdr/vdr-plugin-wirbelscan/trunk/debian/patches/
      - copied from r8483, vdr/vdr-plugin-wirbelscan/trunk/debian/patches/
Modified:
    vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
    vdr/vdr-plugin-wirbelscan/trunk/debian/control
    vdr/vdr-plugin-wirbelscan/trunk/debian/patches/01_kernel-header-include-fix.dpatch
    vdr/vdr-plugin-wirbelscan/trunk/debian/rules

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/changelog?rev=8495&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/changelog Sun Mar 21 11:53:09 2010
@@ -1,13 +1,12 @@
 vdr-plugin-wirbelscan (0.0.5~pre11e-1) experimental; urgency=low
 
   * New upstream pre-release
-  * Removed 01_kernel-header-include-fix.dpatch
-  * Removed dpatch from Build-Depends
+  * Adapted 01_kernel-header-include-fix.dpatch
   * Added libzvbi-dev to Build-Depends
   * Standards-Version: 3.8.4
   * Updated debian/copyright
 
- -- Thomas Günther <tom at toms-cafe.de>  Fri, 19 Mar 2010 22:26:19 +0100
+ -- Thomas Günther <tom at toms-cafe.de>  Sat, 20 Mar 2010 03:25:42 +0100
 
 vdr-plugin-wirbelscan (0.0.4a~20080515-4) experimental; urgency=low
 

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/control?rev=8495&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/control (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/control Sun Mar 21 11:53:09 2010
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, libzvbi-dev
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext, libzvbi-dev
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/patches/01_kernel-header-include-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/patches/01_kernel-header-include-fix.dpatch?rev=8495&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/patches/01_kernel-header-include-fix.dpatch (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/patches/01_kernel-header-include-fix.dpatch Sun Mar 21 11:53:09 2010
@@ -1,25 +1,28 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_kernel-header-include-fix.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## Thomas Günther <tom at toms-cafe.de>:
+##   - adapted to wirbelscan-0.0.5~pre11e
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fixes problem with DVB kernel headers
 
 @DPATCH@
---- vdr-plugin-wirbelscan-0.0.4a~20080515.orig/menusetup.c
-+++ vdr-plugin-wirbelscan-0.0.4a~20080515/menusetup.c
-@@ -7,7 +7,6 @@
+--- wirbelscan-0.0.5-pre11e/dvb_wrapper.c
++++ wirbelscan-0.0.5-pre11e/dvb_wrapper.c
+@@ -1,4 +1,5 @@
+ 
++#include <stdlib.h>
+ #include <linux/dvb/frontend.h> //either API version 3.2 or 5.0
+ #include <linux/dvb/version.h>
+ #include <vdr/dvbdevice.h>
+--- wirbelscan-0.0.5~pre11e/menusetup.c
++++ wirbelscan-0.0.5~pre11e/menusetup.c
+@@ -7,6 +7,7 @@
   */
  
  
--#include <linux/dvb/frontend.h>
++#include <stdlib.h>
+ #include <linux/dvb/frontend.h>
  #include <vdr/menuitems.h>
  #include <vdr/device.h>
- #include <vdr/config.h>
-@@ -19,6 +18,7 @@
- #include "i18n.h"
- #endif
- #include "scanner.h"
-+#include <linux/dvb/frontend.h>
- 
- static const char * verbosities[]={
- "errors only",

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/rules?rev=8495&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/rules (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/rules Sun Mar 21 11:53:09 2010
@@ -1,7 +1,7 @@
 #!/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