[SCM] vdr-plugin-dvd packaging repository branch, master, updated. debian/0.3.6_b03+cvs20090426.0013-9-1-g0038c63

[etobi]

The following commit has been merged in the master branch:
commit 0038c63fef6be5abbbd1faca120154d67dacd896
Author: etobi <git at e-tobi.net>
Date:   Mon Dec 12 20:28:42 2011 +0100

    Build-depend on vdr-dev (>= 1.7.22)
    
    * Build-depend on vdr-dev (>= 1.7.22)
    * When including dvdnvav.h define/undefine the "this" keyword, used in
      dvdnav.h (Closes: #642673)

diff --git a/debian/changelog b/debian/changelog
index 13bb027..a48b7cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-10) unstable; urgency=low
+
+  * Build-depend on vdr-dev (>= 1.7.22)
+  * When including dvdnvav.h define/undefine the "this" keyword, used in
+    dvdnav.h (Closes: #642673)
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 12 Dec 2011 20:22:27 +0100
+
 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-9) unstable; urgency=low
 
   * Switched to GIT using pristine tar
diff --git a/debian/control b/debian/control
index 5d5184c..1a2761c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,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 (>= 7.0.50~),
- vdr-dev (>= 1.7.21),
+ vdr-dev (>= 1.7.22),
  gettext,
  libdvdnav-dev (>=4.1.2-3),
  liba52-0.7.4-dev
diff --git a/debian/patches/13_fix-dvdnav-using-c++-keywords.patch b/debian/patches/13_fix-dvdnav-using-c++-keywords.patch
new file mode 100644
index 0000000..237ad18
--- /dev/null
+++ b/debian/patches/13_fix-dvdnav-using-c++-keywords.patch
@@ -0,0 +1,18 @@
+Description: When including dvdnvav.h define/undefine the "this" keyword,
+ used in dvdnav.h
+Author: Tobias Grimm <etobi at debian.org>
+Bug-Debian: http://bugs.debian.org/642673
+
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h
+@@ -11,8 +11,10 @@
+ #ifndef __PLAYER_DVD_H
+ #define __PLAYER_DVD_H
+ 
++#define this _this
+ #include <dvdnav/dvdnav.h>
+ #include <dvdnav/dvdnav_events.h>
++#undef this
+ 
+ #include <vdr/device.h>
+ #include <vdr/player.h>
diff --git a/debian/patches/series b/debian/patches/series
index 798b7af..77f5f16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 10_dvd.c.patch
 11_allow-non-existing-dvd-drive.patch
 12_dvd-fixed-german-spelling.patch
+13_fix-dvdnav-using-c++-keywords.patch

-- 
vdr-plugin-dvd packaging repository