r447 - in vdr/vdr-plugin-console/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 11 Apr 2005 18:15:45 +0000
Author: tschmidt
Date: 2005-04-11 18:15:44 +0000 (Mon, 11 Apr 2005)
New Revision: 447
Added:
vdr/vdr-plugin-console/trunk/debian/patches/92_console-1.3.18.dpatch
Removed:
vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch
Modified:
vdr/vdr-plugin-console/trunk/debian/changelog
vdr/vdr-plugin-console/trunk/debian/control
vdr/vdr-plugin-console/trunk/debian/patches/00list
vdr/vdr-plugin-console/trunk/debian/patches/03_command_from_cli.dpatch
vdr/vdr-plugin-console/trunk/debian/watch
Log:
vdr-plugin-console:
- New upstream release
- Removed 02_menu.h-fix.dpatch, integrated by upstream
- Updated 03_command_from_cli to apply on the new upstream
- Added 92_console-1.3.18.dpatch from vdrdevel-plugin-console,
to be able to compile the plugin with vdr (>=1.3.18)
- Depend/Build-Depend on vdr (>=1.3.23-1)
- Conflict with vdr (>=1.3.24)
- Do not use "debian uupdate" in debian/watch anymore
Modified: vdr/vdr-plugin-console/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/changelog 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/changelog 2005-04-11 18:15:44 UTC (rev 447)
@@ -1,3 +1,19 @@
+vdr-plugin-console (0.6.0-1) experimental; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ * Thomas Schmidt <tschmidt@debian.org>
+ - New upstream release
+ - Removed 02_menu.h-fix.dpatch, integrated by upstream
+ - Updated 03_command_from_cli to apply on the new upstream
+ - Added 92_console-1.3.18.dpatch from vdrdevel-plugin-console,
+ to be able to compile the plugin with vdr (>=1.3.18)
+ - Depend/Build-Depend on vdr (>=1.3.23-1)
+ - Conflict with vdr (>=1.3.24)
+ - Do not use "debian uupdate" in debian/watch anymore
+
+ -- Thomas Schmidt <tschmidt@debian.org> Mon, 11 Apr 2005 18:25:14 +0200
+
vdr-plugin-console (0.5.1-16) unstable; urgency=low
* Thomas Schmidt <tschmidt@debian.org>
Modified: vdr/vdr-plugin-console/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/control 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/control 2005-04-11 18:15:44 UTC (rev 447)
@@ -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.2.6-7), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.23-1), dpatch (>= 2.0.9)
Standards-Version: 3.6.1
Package: vdr-plugin-console
Architecture: any
-Depends: ${shlibs:Depends}, vdr (>=1.2.6)
-Conflicts: vdr (>=1.2.7)
+Depends: ${shlibs:Depends}, vdr (>=1.3.23-1)
+Conflicts: vdr (>=1.3.24)
Description: Plugin for vdr that implements a virtual terminal
This plugin for vdr implements a virtual terminal, that can be
displayed by vdr's OSD, it allows you to display and control
Modified: vdr/vdr-plugin-console/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/00list 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/patches/00list 2005-04-11 18:15:44 UTC (rev 447)
@@ -1,3 +1,3 @@
01_Makefile-fPIC-fix
-02_menu.h-fix
03_command_from_cli
+92_console-1.3.18
Deleted: vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch 2005-04-11 18:15:44 UTC (rev 447)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 02_menu.h-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix menu.h, so that the plugin works with vdr (>=1.2.5pre3)
-
-@DPATCH@
-diff -urNad /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h vdr-plugin-console-0.5.1/menu.h
---- /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h 2002-12-31 13:09:24.000000000 +0100
-+++ vdr-plugin-console-0.5.1/menu.h 2004-08-06 19:08:07.000000000 +0200
-@@ -161,7 +161,6 @@
- public:
- cMenuConsole( int consoleNr );
- virtual eOSState ProcessKey( eKeys Key );
-- void Display();
- };
-
-
Modified: vdr/vdr-plugin-console/trunk/debian/patches/03_command_from_cli.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/03_command_from_cli.dpatch 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/patches/03_command_from_cli.dpatch 2005-04-11 18:15:44 UTC (rev 447)
@@ -6,14 +6,13 @@
## DP: command should be called when starting the plugin.
@DPATCH@
-diff -urNad vdr-plugin-console-0.5.1/console.c /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/console.c
---- vdr-plugin-console-0.5.1/console.c 2005-03-26 14:54:18.244457384 +0100
-+++ /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/console.c 2005-03-26 14:54:18.995343232 +0100
-@@ -56,14 +56,32 @@
+diff -urNad vdr-plugin-console-0.6.0/console.c /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/console.c
+--- vdr-plugin-console-0.6.0/console.c 2004-09-11 23:44:25.000000000 +0200
++++ /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/console.c 2005-04-11 19:55:48.583455832 +0200
+@@ -60,14 +60,34 @@
+ const char *cPluginConsole::CommandLineHelp() {
- const char *cPluginConsole::CommandLineHelp(void) {
--
- return NULL;
+ // Return a string that describes all known command line options.
+ return " -c prog, --command=prog specify the programm which is\n"
@@ -21,8 +20,9 @@
}
+
bool cPluginConsole::ProcessArgs(int argc, char *argv[]) {
--
+
- return true;
+ // Implement command line argument processing here if applicable.
+ static struct option long_options[] = {
@@ -46,10 +46,10 @@
}
-diff -urNad vdr-plugin-console-0.5.1/engine.c /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/engine.c
---- vdr-plugin-console-0.5.1/engine.c 2005-03-26 14:54:18.245457232 +0100
-+++ /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/engine.c 2005-03-26 14:54:50.518550976 +0100
-@@ -19,6 +19,17 @@
+diff -urNad vdr-plugin-console-0.6.0/virtualconsoles.c /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/virtualconsoles.c
+--- vdr-plugin-console-0.6.0/virtualconsoles.c 2004-09-11 23:40:18.000000000 +0200
++++ /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/virtualconsoles.c 2005-04-11 20:11:07.817766136 +0200
+@@ -20,6 +20,17 @@
#include "i18n.h"
@@ -66,27 +66,26 @@
+#endif
+ cConsConsoles::cConsConsoles()
+@@ -128,9 +139,9 @@
-@@ -1582,9 +1593,9 @@
+ int cConsConsoles::CreateConsole() {
- int cConsoles::CreateConsole() {
-
-- char* const args[] = { PROG_FOR_CONSOLE, NULL };
+- char* const args[] = {PROG_FOR_CONSOLE, NULL};
+ char* const args[] = { (char*)ConsoleCmd, NULL };
-- cVirtualConsole* p = new cVirtualConsole( tr("Console"), PROG_FOR_CONSOLE, args );
-+ cVirtualConsole* p = new cVirtualConsole( tr("Console"), ConsoleCmd, args );
+- cConsVirtualConsole* p = new cConsVirtualConsole(tr("Console"), PROG_FOR_CONSOLE, args);
++ cConsVirtualConsole* p = new cConsVirtualConsole( tr("Console"), ConsoleCmd, args );
if (p) {
-diff -urNad vdr-plugin-console-0.5.1/engine.h /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/engine.h
---- vdr-plugin-console-0.5.1/engine.h 2005-03-26 14:54:18.245457232 +0100
-+++ /tmp/dpep.CXpZA5/vdr-plugin-console-0.5.1/engine.h 2005-03-26 14:54:18.996343080 +0100
-@@ -23,21 +23,7 @@
- #define CONSOLE_DEBUG( xx )
- //#define CONSOLE_DEBUG( xx ) xx;
+diff -urNad vdr-plugin-console-0.6.0/virtualconsoles.h /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/virtualconsoles.h
+--- vdr-plugin-console-0.6.0/virtualconsoles.h 2004-09-11 23:40:18.000000000 +0200
++++ /tmp/dpep.7Ca0hf/vdr-plugin-console-0.6.0/virtualconsoles.h 2005-04-11 19:55:48.584455680 +0200
+@@ -21,19 +21,7 @@
--
+
+
-// This program will be used to realize a console.
-// Be carefull! If your VDR runs as root, then every
-// user can kill your machine if you don't protect
@@ -100,16 +99,7 @@
-#endif
-
-
--
+extern const char *ConsoleCmd;
- // With the small font there are many cells possible
- #define CONSOLE_MAXCOLS 100
-@@ -47,7 +33,6 @@
-
-
--
- // define used keys
-
- #define BS '\010' // Backspace
+ class cConsVirtualConsole;
Added: vdr/vdr-plugin-console/trunk/debian/patches/92_console-1.3.18.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/92_console-1.3.18.dpatch 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/patches/92_console-1.3.18.dpatch 2005-04-11 18:15:44 UTC (rev 447)
@@ -0,0 +1,54 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## console-1.3.18 patch by free-x @ vdrportal.de
+##
+## downloaded from http://www.vdrportal.de/board/thread.php?threadid=28325
+## original file: vdr-1.3.18-console-0.6.0.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.18.
+
+@DPATCH@
+diff -ru console-0.6.0/menu.c console-0.6.0-patched/menu.c
+--- console-0.6.0/menu.c Sat Sep 11 22:10:57 2004
++++ console-0.6.0-patched/menu.c Fri Jan 14 11:15:42 2005
+@@ -1210,14 +1210,14 @@
+ }
+ case kNone:
+ // Handle blinking elements
+- if (time_ms() >= _nextBlinkTime) {
++ if ((int)cTimeMs::Now() >= _nextBlinkTime) {
+
+- _nextBlinkTime = time_ms() + config.BlinkRate * 100;
++ _nextBlinkTime = cTimeMs::Now() + config.BlinkRate * 100;
+ _blink = !_blink;
+ }
+
+ // Handle keyboard releaseing
+- if (time_ms() >= _timeReleaseCapture) {
++ if ((int)cTimeMs::Now() >= _timeReleaseCapture) {
+ _timeReleaseCapture = INT_MAX;
+
+ // Time elapsed -> repost ESC...
+@@ -1243,10 +1243,10 @@
+ _pConsole->getScreen().BellSeen();
+
+ if (config.BellTimeout) {
+- _toRing = time_ms() + config.BellTimeout * 1000;
++ _toRing = cTimeMs::Now() + config.BellTimeout * 1000;
+ state = osUser1;
+ }
+- } else if (_toRing && time_ms() > _toRing) {
++ } else if (_toRing && (int)cTimeMs::Now() > _toRing) {
+ _toRing = 0;
+ state = osUser1;
+ }
+@@ -1441,7 +1441,7 @@
+ // esc detected. Ask for exit
+ if (data[i] == ESC) {
+
+- _timeReleaseCapture = time_ms() + 1000;
++ _timeReleaseCapture = cTimeMs::Now() + 1000;
+ _inputState = 1;
+
+ } else
Modified: vdr/vdr-plugin-console/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/watch 2005-04-10 22:13:37 UTC (rev 446)
+++ vdr/vdr-plugin-console/trunk/debian/watch 2005-04-11 18:15:44 UTC (rev 447)
@@ -1,2 +1,2 @@
version=2
-http://ricomp.de/vdr/vdr-console-(.*).tgz debian uupdate
+http://ricomp.de/vdr/vdr-console-(.*).tgz