[SCM] vdr-plugin-zaphistory packaging repository branch, master, updated. debian/0.9.5-21-2-gb17d2ba

[etobi]

The following commit has been merged in the master branch:
commit b17d2babf531b28b076e049d308c21ce3e5b9c97
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 16 18:58:44 2013 +0100

    Added patch for VDR 1.7.33 from Lars Hanisch (yaVDR)

diff --git a/debian/changelog b/debian/changelog
index 271684e..999f9fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ vdr-plugin-zaphistory (0.9.5-22) UNRELEASED; urgency=low
   * Standards-Version: 3.9.4
   * Build-depend in vdr-dev (>= 1.7.40)
   * Use debhelper 9
+  * Added patch for VDR 1.7.33 from Lars Hanisch (yaVDR)
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 16 Mar 2013 18:54:44 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 2198405..47ba9ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 vdr-1.7.27-i18n.patch
 vdr-1.7.27-api.patch
+zaphistory-vdr-1.7.33.patch
diff --git a/debian/patches/zaphistory-vdr-1.7.33.patch b/debian/patches/zaphistory-vdr-1.7.33.patch
new file mode 100644
index 0000000..f84594b
--- /dev/null
+++ b/debian/patches/zaphistory-vdr-1.7.33.patch
@@ -0,0 +1,39 @@
+--- a/epg_item.c
++++ b/epg_item.c
+@@ -25,7 +25,7 @@
+ {
+   event = Event;
+   progress = Progress;
+-  timerMatch = 0;
++  timerMatch = tmNone;
+   Update(true);
+ }
+ 
+@@ -34,7 +34,12 @@
+   bool result = false;
+   const cChannel* channel = zapChannel->GetChannel();
+   
+-  int OldTimerMatch = timerMatch;
++#if VDRVERSNUM < 10733
++  int OldTimerMatch;
++#else
++  eTimerMatch OldTimerMatch;
++#endif
++  OldTimerMatch = timerMatch;
+   bool hasMatch = false;
+   
+   if (event)
+--- a/epg_item.h
++++ b/epg_item.h
+@@ -18,7 +18,11 @@
+   const cEvent *event;
+   
+   int progress;
++#if VDRVERSNUM < 10733
+   int timerMatch;
++#else
++  eTimerMatch timerMatch;
++#endif
+ 
+ public:
+   

-- 
vdr-plugin-zaphistory packaging repository