r618 - in vdr/vdr-plugin-wapd/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 31 May 2005 13:24:16 +0000
Author: tschmidt
Date: 2005-05-31 13:24:15 +0000 (Tue, 31 May 2005)
New Revision: 618
Added:
vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.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.25-1)
- Conflict with vdr (>=1.3.26)
- Added 03_vdr_1.3.24-fix.dpatch to make the plugin compatible
with vdr (>=1.3.24)
- Added 04_wmlescape.dpatch
Modified: vdr/vdr-plugin-wapd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/changelog 2005-05-31 13:06:14 UTC (rev 617)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog 2005-05-31 13:24:15 UTC (rev 618)
@@ -1,9 +1,20 @@
-vdr-plugin-wapd (0.7a-1) unstable; urgency=low
+vdr-plugin-wapd (0.7a-2) experimental; urgency=low
- !!! unreleased !!!
+ * (NOT YET RELEASED)
todo: create /etc/vdr/plugins/wapaccess using debconf?
+ * Thomas Schmidt <tschmidt@debian.org>
+ - Depend/Build-Depend on vdr (>=1.3.25-1)
+ - Conflict with vdr (>=1.3.26)
+ - Added 03_vdr_1.3.24-fix.dpatch to make the plugin compatible
+ with vdr (>=1.3.24)
+ - Added 04_wmlescape.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 31 May 2005 15:07:16 +0200
+
+vdr-plugin-wapd (0.7a-1) unstable; urgency=low
+
* Tobias Grimm <tg@e-tobi.net>
- New upstream release
- Removed dependency to libapache-htpasswd-perl (upstream provides
Modified: vdr/vdr-plugin-wapd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/control 2005-05-31 13:06:14 UTC (rev 617)
+++ vdr/vdr-plugin-wapd/trunk/debian/control 2005-05-31 13:24:15 UTC (rev 618)
@@ -3,13 +3,13 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.23-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.25-1), dpatch (>= 2.0.9)
Standards-Version: 3.6.1
Package: vdr-plugin-wapd
Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= 1.3.23-1), debconf
-Conflicts: vdr (>= 1.3.24)
+Depends: ${shlibs:Depends}, vdr (>= 1.3.25-1), debconf
+Conflicts: vdr (>= 1.3.26)
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-05-31 13:06:14 UTC (rev 617)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/00list 2005-05-31 13:24:15 UTC (rev 618)
@@ -1,2 +1,4 @@
01_Makefile-fPIC-fix
02_vdr_1.3.23-fix
+03_vdr_1.3.24-fix
+04_wmlescape
Added: vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch 2005-05-31 13:06:14 UTC (rev 617)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch 2005-05-31 13:24:15 UTC (rev 618)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_vdr_1.3.24-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.24)
+## DP: (Many thanks to Ville Skyttä)
+
+@DPATCH@
+diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.Y3Ruln/vdr-plugin-wapd-0.7a/server.c
+--- vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:12:27.956145104 +0200
++++ /tmp/dpep.Y3Ruln/vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:12:56.190852776 +0200
+@@ -229,7 +229,11 @@
+ if (Option("settings")) {
+ unurilize(getopt);
+ cChannel ch;
++#if VDRVERSNUM > 10323
++ if (ch.Parse(getopt)) {
++#else
+ if (ch.Parse(getopt, true)) {
++#endif
+ if (nr) {
+ cChannel *channel = Channels.GetByNumber(nr);
+ if (Channels.HasUniqueChannelID(&ch, channel)) {
Property changes on: vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch 2005-05-31 13:06:14 UTC (rev 617)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch 2005-05-31 13:24:15 UTC (rev 618)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_wmlescape.dpatch by Thomas Schmidt <tschmidt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Ville Skyttä to use correct wml escape sequences for filenames
+
+@DPATCH@
+diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.koO10n/vdr-plugin-wapd-0.7a/server.c
+--- vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:12:27.956145104 +0200
++++ /tmp/dpep.koO10n/vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:15:22.127667008 +0200
+@@ -505,7 +505,7 @@
+ wmltr("Stop"), base, stop / 100, stop %100,
+ wmltr("Priority"), base, priority,
+ wmltr("Lifetime"), base, lifetime,
+- wmltr("File"), base, file);
++ wmltr("File"), base, wmlescape(file));
+ if (timer)
+ ReplyBuffer(WML_END(WML_DO("%s", URI_MAIN) WML_ENDDO()
+ WML_DO("%s", URI_TIMERS) WML_ENDDO()
Property changes on: vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch
___________________________________________________________________
Name: svn:executable
+ *