r1882 - in vdr/vdr-plugin-wapd/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-01-31 18:12:31 +0000 (Tue, 31 Jan 2006)
New Revision: 1882

Added:
   vdr/vdr-plugin-wapd/trunk/debian/patches/90_wapd-0.8-1.3.41.dpatch
Modified:
   vdr/vdr-plugin-wapd/trunk/debian/changelog
   vdr/vdr-plugin-wapd/trunk/debian/control
   vdr/vdr-plugin-wapd/trunk/debian/copyright
   vdr/vdr-plugin-wapd/trunk/debian/patches/00list
Log:
Added 90_wapd-0.8-1.3.41.dpatch

Modified: vdr/vdr-plugin-wapd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/changelog	2006-01-29 18:37:16 UTC (rev 1881)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog	2006-01-31 18:12:31 UTC (rev 1882)
@@ -1,3 +1,12 @@
+vdr-plugin-wapd (0.8-2) unstable; urgency=low
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Added 90_wapd-0.8-1.3.41.dpatch
+    - Build-Depend on vdr-dev (>= 1.3.41-1)
+    - Shortened debian/copyright
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 31 Jan 2006 18:52:51 +0100
+
 vdr-plugin-wapd (0.8-1) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-wapd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/control	2006-01-29 18:37:16 UTC (rev 1881)
+++ vdr/vdr-plugin-wapd/trunk/debian/control	2006-01-31 18:12:31 UTC (rev 1882)
@@ -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>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.40-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.41-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-wapd

Modified: vdr/vdr-plugin-wapd/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/copyright	2006-01-29 18:37:16 UTC (rev 1881)
+++ vdr/vdr-plugin-wapd/trunk/debian/copyright	2006-01-31 18:12:31 UTC (rev 1882)
@@ -1,4 +1,5 @@
-This package was debianized by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de> on Sat, 13 Nov 2004 14:14:35 +0100.
+This package was debianized by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de> on
+Sat, 13 Nov 2004 14:14:35 +0100.
 
 It was downloaded from http://vdr.heiligenmann.de/download/
 
@@ -6,19 +7,5 @@
 
 Copyright:
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
-
-  see /usr/share/common-licenses/GPL
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .

Modified: vdr/vdr-plugin-wapd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/00list	2006-01-29 18:37:16 UTC (rev 1881)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/00list	2006-01-31 18:12:31 UTC (rev 1882)
@@ -1 +1,3 @@
 01_Makefile-fPIC-fix
+
+90_wapd-0.8-1.3.41

Added: vdr/vdr-plugin-wapd/trunk/debian/patches/90_wapd-0.8-1.3.41.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/90_wapd-0.8-1.3.41.dpatch	2006-01-29 18:37:16 UTC (rev 1881)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/90_wapd-0.8-1.3.41.dpatch	2006-01-31 18:12:31 UTC (rev 1882)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_wapd-0.8-1.3.41.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.41.
+
+ at DPATCH@
+--- wapd-0.8/server.c
++++ wapd-0.8/server.c
+@@ -694,7 +694,7 @@
+            int offset = strtol(getopt, NULL, 10);
+            int i = 0;
+            const cEvent *PresentEvent =
+-              Schedule->GetPresentEvent(channel->Number() == cDevice::CurrentChannel());
++              Schedule->GetPresentEvent();
+            time_t now = time(NULL) - Setup.EPGLinger * 60;
+            for (const cEvent *Event = Schedule->Events()->First();
+                 Event;