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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-04-17 19:50:14 +0000 (Sun, 17 Apr 2005)
New Revision: 470

Added:
   vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch
Modified:
   vdr/vdr-plugin-wapd/trunk/debian/changelog
   vdr/vdr-plugin-wapd/trunk/debian/control
   vdr/vdr-plugin-wapd/trunk/debian/patches/00list
Log:
vdr-plugin-wapd:
    - Depend/Build-Depend on vdr (>=1.3.23-1)
    - Conflict with vdr (>=1.3.24)
    - Added 02_vdr_1.3.23-fix.dpatch to be able to compile the plugin
      with vdr (>=1.3.23)
    - Changed my email address to the one from Debian


Modified: vdr/vdr-plugin-wapd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/changelog	2005-04-17 19:03:15 UTC (rev 469)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog	2005-04-17 19:50:14 UTC (rev 470)
@@ -8,8 +8,14 @@
     - New upstream release
     - Removed dependency to libapache-htpasswd-perl (upstream provides
       "wappasswd" now)
+  * Thomas Schmidt <tschmidt@debian.org>
+    - Depend/Build-Depend on vdr (>=1.3.23-1)
+    - Conflict with vdr (>=1.3.24)
+    - Added 02_vdr_1.3.23-fix.dpatch to be able to compile the plugin
+      with vdr (>=1.3.23)
+    - Changed my email address to the one from Debian
 
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Wed, 26 Jan 2005 20:54:24 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 17 Apr 2005 21:14:34 +0200
 
 vdr-plugin-wapd (0.0.6d-1) unstable; urgency=low
   

Modified: vdr/vdr-plugin-wapd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/control	2005-04-17 19:03:15 UTC (rev 469)
+++ vdr/vdr-plugin-wapd/trunk/debian/control	2005-04-17 19:50:14 UTC (rev 470)
@@ -2,14 +2,14 @@
 Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> 
-Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6-6), dpatch (>= 2.0.9)
+Uploaders: Thomas Schmidt <tschmidt@debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.23-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-wapd
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6-6), debconf
-Conflicts: vdr (>= 1.2.7)
+Depends: ${shlibs:Depends}, vdr (>= 1.3.23-1), debconf
+Conflicts: vdr (>= 1.3.24)
 Description: Plugin to control vdr via mobile devices
  This plugin lets VDR listen to WAP requests to allow remote control 
  by WML enabled browsers - eg. mobile devices - and is called 

Modified: vdr/vdr-plugin-wapd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/00list	2005-04-17 19:03:15 UTC (rev 469)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/00list	2005-04-17 19:50:14 UTC (rev 470)
@@ -1 +1,2 @@
 01_Makefile-fPIC-fix
+02_vdr_1.3.23-fix

Added: vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch	2005-04-17 19:03:15 UTC (rev 469)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch	2005-04-17 19:50:14 UTC (rev 470)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_vdr_1.3.23-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makes the plugin compatible with vdr (>=1.3.23)
+
+@DPATCH@
+diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.wuM7Av/vdr-plugin-wapd-0.7a/server.c
+--- vdr-plugin-wapd-0.7a/server.c	2005-01-25 21:32:24.000000000 +0100
++++ /tmp/dpep.wuM7Av/vdr-plugin-wapd-0.7a/server.c	2005-04-17 21:38:12.794043736 +0200
+@@ -481,7 +481,11 @@
+            flags = timer->Active() ? 1 : 0;
+ #endif
+            channel_nr = timer->Channel()->Number();
++#if VDRVERSNUM >= 10323
++           day = strdup(timer->PrintDay(0, timer->WeekDays()));
++#else
+            day = strdup(timer->PrintDay(timer->Day()));
++#endif
+            start = timer->Start();
+            stop = timer->Stop();
+            priority = timer->Priority();
+@@ -956,7 +960,9 @@
+                  timer->Stop() / 100,
+                  timer->Stop() % 100,
+                  timer->Channel()->Number(),
+-#if VDRVERSNUM >= 10318
++#if VDRVERSNUM >= 10323
++                 *timer->PrintDay(0, timer->WeekDays()),
++#elif VDRVERSNUM >= 10318
+                  *timer->PrintDay(timer->Day()),
+ #else
+                  timer->PrintDay(timer->Day()),
+diff -urNad vdr-plugin-wapd-0.7a/wappasswd.c /tmp/dpep.wuM7Av/vdr-plugin-wapd-0.7a/wappasswd.c
+--- vdr-plugin-wapd-0.7a/wappasswd.c	2005-01-25 16:35:05.000000000 +0100
++++ /tmp/dpep.wuM7Av/vdr-plugin-wapd-0.7a/wappasswd.c	2005-04-17 21:38:12.794043736 +0200
+@@ -1,3 +1,4 @@
++#include <crypt.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>


Property changes on: vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *