r1876 - in vdr/vdr-plugin-wapd/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Thu Jan 26 22:12:56 UTC 2006
Author: tiber-guest
Date: 2006-01-26 22:12:55 +0000 (Thu, 26 Jan 2006)
New Revision: 1876
Removed:
vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch
vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch
vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch
vdr/vdr-plugin-wapd/trunk/debian/patches/05_vdr_1.3.32-fix.dpatch
vdr/vdr-plugin-wapd/trunk/debian/patches/06_vdr_1.3.36-fix.dpatch
Modified:
vdr/vdr-plugin-wapd/trunk/debian/changelog
vdr/vdr-plugin-wapd/trunk/debian/patches/00list
Log:
- New upstream release
- Removed 02_vdr_1.3.23-fix.dpatch
- Removed 03_vdr_1.3.24-fix.dpatch
- Removed 04_wmlescape.dpatch
- Removed 05_vdr_1.3.32-fix.dpatch
- Removed 06_vdr_1.3.36-fix.dpatch
Modified: vdr/vdr-plugin-wapd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/changelog 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,3 +1,15 @@
+vdr-plugin-wapd (0.8-1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - New upstream release
+ - Removed 02_vdr_1.3.23-fix.dpatch
+ - Removed 03_vdr_1.3.24-fix.dpatch
+ - Removed 04_wmlescape.dpatch
+ - Removed 05_vdr_1.3.32-fix.dpatch
+ - Removed 06_vdr_1.3.36-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 26 Jan 2006 23:12:31 +0100
+
vdr-plugin-wapd (0.7a-14) unstable; urgency=low
* Tobias Grimm <tg at e-tobi.net>
Modified: vdr/vdr-plugin-wapd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/00list 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/00list 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,6 +1 @@
01_Makefile-fPIC-fix
-02_vdr_1.3.23-fix
-03_vdr_1.3.24-fix
-04_wmlescape
-05_vdr_1.3.32-fix
-06_vdr_1.3.36-fix
Deleted: 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 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/02_vdr_1.3.23-fix.dpatch 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_vdr_1.3.23-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes the plugin compatible with vdr (>=1.3.23)
-
- at 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>
Deleted: 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 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/03_vdr_1.3.24-fix.dpatch 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_vdr_1.3.24-fix.dpatch by Thomas Schmidt <tschmidt at 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ä)
-
- at DPATCH@
-diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.xmLJUd/vdr-plugin-wapd-0.7a/server.c
---- vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:26:10.520829328 +0200
-+++ /tmp/dpep.xmLJUd/vdr-plugin-wapd-0.7a/server.c 2005-05-31 15:30:28.740573960 +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)) {
-@@ -549,8 +553,13 @@
- int level = recording->HierarchyLevels();
- char *title = wmlescape(strdup(recording->Title(' ', false, level)));
- ReplyBuffer("%s" WML_BR(), title);
-+#if VDRVERSNUM > 10324
-+ if (recording->Info()->Description()) {
-+ char *sum = wmlescape(strdup(recording->Info()->Description()));
-+#else
- if (recording->Summary()) {
- char *sum = wmlescape(strdup(recording->Summary()));
-+#endif
- char *tok;
- char *subtitle = strtok_r(sum, "\n", &tok);
- subtitle = strtok_r(NULL, "\n", &tok);
Deleted: vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/04_wmlescape.dpatch 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_wmlescape.dpatch by Thomas Schmidt <tschmidt at 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
-
- at 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()
Deleted: vdr/vdr-plugin-wapd/trunk/debian/patches/05_vdr_1.3.32-fix.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/05_vdr_1.3.32-fix.dpatch 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/05_vdr_1.3.32-fix.dpatch 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 05_vdr_1.3.32-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix building for vdr 1.3.32
-
- at DPATCH@
-diff -urNad vdr-plugin-wapd-0.7a/server.c /tmp/dpep.v5bmXN/vdr-plugin-wapd-0.7a/server.c
---- vdr-plugin-wapd-0.7a/server.c 2005-09-11 22:15:21.631959520 +0200
-+++ /tmp/dpep.v5bmXN/vdr-plugin-wapd-0.7a/server.c 2005-09-11 22:15:46.736143104 +0200
-@@ -16,6 +16,7 @@
- #include <vdr/i18n.h>
- #include <vdr/recording.h>
- #include <vdr/font.h>
-+#include <vdr/device.h>
- #include "server.h"
- #include "tools.h"
- #include "i18n.h"
Deleted: vdr/vdr-plugin-wapd/trunk/debian/patches/06_vdr_1.3.36-fix.dpatch
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/patches/06_vdr_1.3.36-fix.dpatch 2006-01-26 22:05:05 UTC (rev 1875)
+++ vdr/vdr-plugin-wapd/trunk/debian/patches/06_vdr_1.3.36-fix.dpatch 2006-01-26 22:12:55 UTC (rev 1876)
@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 06_vdr_1.3.36-fix.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.36.
-
- at DPATCH@
---- wapd-0.7a/server.h
-+++ wapd-0.7a/server.h
-@@ -17,6 +17,10 @@
- #include <vdr/tools.h>
- #include "access.h"
-
-+#if VDRVERSNUM >= 10336
-+#define MAXPARSEBUFFER KILOBYTE(10)
-+#endif
-+
- #define WMLBUFFER 3*MAXPARSEBUFFER
-
- class cWapServer : cThread {
More information about the pkg-vdr-dvb-changes
mailing list