--- vdr-plugin-control-0.0.2a.orig/debian/rules +++ vdr-plugin-control-0.0.2a/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +DEB_INSTALL_CHANGELOGS_ALL = HISTORY + +MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \ + LOCALEDIR=debian/tmp/usr/share/locale + +common-build-arch:: + $(MAKE) all $(MAKE_OPTIONS) + +cleanbuilddir:: + $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) + rm -f libvdr-*.so.* + +common-binary-predeb-arch:: + sh /usr/share/vdr-dev/dependencies.sh --- vdr-plugin-control-0.0.2a.orig/debian/control +++ vdr-plugin-control-0.0.2a/debian/control @@ -0,0 +1,15 @@ +Source: vdr-plugin-control +Section: video +Priority: extra +Maintainer: Rene Bartsch +Origin: ctvdr +Bugs: mailto:pkg-vdr-dvb-devel@lists.alioth.debian.org +Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5) +Standards-Version: 3.8.3 + +Package: vdr-plugin-control +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} +Description: Plugin to control vdr OSD by console or telnet + This plugin allows to control VDR by console or telnet + even if the systems does not have any full featured DVB card. --- vdr-plugin-control-0.0.2a.orig/debian/install +++ vdr-plugin-control-0.0.2a/debian/install @@ -0,0 +1,2 @@ +libvdr-control.so.* usr/lib/vdr/plugins/ +debian/plugin.control.conf etc/vdr/plugins/ --- vdr-plugin-control-0.0.2a.orig/debian/watch +++ vdr-plugin-control-0.0.2a/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ricomp.de/vdr/vdr-control-(.+)\.tgz --- vdr-plugin-control-0.0.2a.orig/debian/copyright +++ vdr-plugin-control-0.0.2a/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Rene Bartsch (ml@bartschnet.de> on +Tue, 28 Sep 2002004 01:13:00 +0200. + +It was downloaded from http://ricomp.de/vdr/ + +Upstream Author: Jan Rieger + +Copyright: + +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 . --- vdr-plugin-control-0.0.2a.orig/debian/plugin.control.conf +++ vdr-plugin-control-0.0.2a/debian/plugin.control.conf @@ -0,0 +1,3 @@ +# Default: no TTY, port 2002 +# Example: TTY9, port 2005 +#-t /dev/tty9 -p 2005 --- vdr-plugin-control-0.0.2a.orig/debian/compat +++ vdr-plugin-control-0.0.2a/debian/compat @@ -0,0 +1 @@ +5 --- vdr-plugin-control-0.0.2a.orig/debian/README.source +++ vdr-plugin-control-0.0.2a/debian/README.source @@ -0,0 +1,7 @@ +This package uses the dpatch system to save and apply patches to the +upstream source code of the software that is packaged. For details +about how to use dpatch read + + /usr/share/doc/dpatch/README.source.gz + +from the dpatch package. --- vdr-plugin-control-0.0.2a.orig/debian/docs +++ vdr-plugin-control-0.0.2a/debian/docs @@ -0,0 +1 @@ +README --- vdr-plugin-control-0.0.2a.orig/debian/changelog +++ vdr-plugin-control-0.0.2a/debian/changelog @@ -0,0 +1,519 @@ +vdr-plugin-control (0.0.2a-66yavdr16~lucid) lucid; urgency=high + + * Rebuild for yaVDR 0.3.3 + + -- Frank Neumann Wed, 17 Oct 2012 03:25:27 +0200 + +vdr-plugin-control (0.0.2a-66yavdr15~lucid) lucid; urgency=high + + * Rebuild for yaVDR 0.3.3 + + -- Frank Neumann Tue, 27 Mar 2012 12:46:22 +0200 + +vdr-plugin-control (0.0.2a-66yavdr14~lucid) lucid; urgency=high + + * Rebuild for yaVDR 0.3.3 + + -- Frank Neumann Sat, 17 Mar 2012 15:37:38 +0100 + +vdr-plugin-control (0.0.2a-66yavdr13~lucid) lucid; urgency=high + + * Rebuild for yaVDR 0.3.3 + + -- Frank Neumann Wed, 14 Mar 2012 01:46:24 +0100 + +vdr-plugin-control (0.0.2a-66yavdr12~lucid) lucid; urgency=high + + * Rebuild due ffmpeg corrections + + -- Frank Neumann Sun, 25 Dec 2011 18:22:58 +0100 + +vdr-plugin-control (0.0.2a-66yavdr11~lucid) lucid; urgency=medium + + * rebuild + + -- Frank Neumann Mon, 05 Sep 2011 19:35:04 +0200 + +vdr-plugin-control (0.0.2a-66yavdr12~lucid) lucid; urgency=medium + + * rebuild + + -- Frank Neumann Mon, 05 Sep 2011 16:05:54 +0200 + +vdr-plugin-control (0.0.2a-66yavdr11~lucid) lucid; urgency=low + + * rebuild + + -- Frank Neumann Sun, 04 Sep 2011 16:40:59 +0200 + +vdr-plugin-control (0.0.2a-66yavdr10~lucid) lucid; urgency=low + + * rebuild + + -- Frank Neumann Sat, 20 Aug 2011 16:31:30 +0200 + +vdr-plugin-control (0.0.2a-66yavdr9~natty) natty; urgency=low + + * rebuild + + -- Holger Schvestka Thu, 18 Aug 2011 19:59:26 +0200 + +vdr-plugin-control (0.0.2a-66yavdr8~natty) natty; urgency=low + + * rebuild + + -- Holger Schvestka Wed, 15 Jun 2011 13:39:53 +0200 + +vdr-plugin-control (0.0.2a-66yavdr7~natty) natty; urgency=low + + * rebuild + + -- Holger Schvestka Tue, 14 Jun 2011 20:38:18 +0200 + +vdr-plugin-control (0.0.2a-66yavdr6~natty) natty; urgency=low + + * rebuild + + -- Holger Schvestka Wed, 25 May 2011 13:49:11 +0200 + +vdr-plugin-control (0.0.2a-66yavdr5~natty) natty; urgency=low + + * rebuild + + -- Holger Schvestka Sun, 22 May 2011 22:50:28 +0200 + +vdr-plugin-control (0.0.2a-66yavdr4~natty) natty; urgency=low + + * rebuild + + -- Marco Scholl Tue, 19 Apr 2011 19:48:44 +0200 + +vdr-plugin-control (0.0.2a-66yavdr3~natty) natty; urgency=low + + * rebuild + + -- Marco Scholl Sun, 03 Apr 2011 22:00:19 +0200 + +vdr-plugin-control (0.0.2a-66yavdr2~natty) natty; urgency=low + + * rebuild + + -- Marco Scholl Tue, 22 Mar 2011 23:06:10 +0100 + +vdr-plugin-control (0.0.2a-66yavdr1~natty) natty; urgency=low + + * natty migration + + -- Marco Scholl Mon, 14 Mar 2011 22:04:08 +0100 + +vdr-plugin-control (0.0.2a-65yavdr1~natty) natty; urgency=low + + * natty migration + + -- Marco Scholl Thu, 03 Mar 2011 01:27:19 +0100 + +vdr-plugin-control (0.0.2a-64yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Fri, 18 Feb 2011 23:21:41 +0100 + +vdr-plugin-control (0.0.2a-63yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Tue, 15 Feb 2011 14:46:15 +0100 + +vdr-plugin-control (0.0.2a-62yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Thu, 10 Feb 2011 08:33:38 +0100 + +vdr-plugin-control (0.0.2a-61yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Wed, 09 Feb 2011 01:00:51 +0100 + +vdr-plugin-control (0.0.2a-60yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Tue, 08 Feb 2011 23:12:11 +0100 + +vdr-plugin-control (0.0.2a-59yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Sun, 16 Jan 2011 21:44:49 +0100 + +vdr-plugin-control (0.0.2a-58yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Sat, 08 Jan 2011 21:17:09 +0100 + +vdr-plugin-control (0.0.2a-57yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Fri, 07 Jan 2011 19:24:45 +0100 + +vdr-plugin-control (0.0.2a-56yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Mon, 03 Jan 2011 19:36:33 +0100 + +vdr-plugin-control (0.0.2a-55yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Tue, 02 Nov 2010 19:55:48 +0100 + +vdr-plugin-control (0.0.2a-54yavdr1) lucid; urgency=low + + * reb. vdr-1.7.16 unstable repo + + -- Holger Schvestka Fri, 24 Sep 2010 23:57:35 +0200 + +vdr-plugin-control (0.0.2a-49yavdr1) lucid; urgency=low + + * reb. vdr-1.7.15 unstable repo + + -- Holger Schvestka Thu, 01 Jul 2010 23:12:28 +0200 + +vdr-plugin-control (0.0.2a-47yavdr1) lucid; urgency=low + + * reb. vdr-1.7.15 unstable repo + + -- Holger Schvestka Mon, 14 Jun 2010 23:06:30 +0200 + +vdr-plugin-control (0.0.2a-46yavdr1) lucid; urgency=low + + * reb. vdr-1.7.14 unstable repo + + -- Holger Schvestka Thu, 20 May 2010 09:39:43 +0200 + +vdr-plugin-control (0.0.2a-45yavdr1) lucid; urgency=low + + * reb. vdr-1.7.14 + + -- Holger Schvestka Mon, 15 Mar 2010 22:23:35 +0100 + +vdr-plugin-control (0.0.2a-44yavdr1) karmic; urgency=low + + * reb. vdr-1.7.12 + + -- Holger Schvestka Sun, 21 Feb 2010 19:54:36 +0100 + +vdr-plugin-control (0.0.2a-43tvt1) karmic; urgency=low + + * updated ABI version + + -- Gerald Dachs Fri, 25 Dec 2009 21:01:05 +0100 + +vdr-plugin-control (0.0.2a-42tvt1) karmic; urgency=low + + * rebuild for vdr 1.7.10 + + -- Gerald Dachs Tue, 24 Nov 2009 15:45:03 +0100 + +vdr-plugin-control (0.0.2a-41tvt1) karmic; urgency=low + + * rebuild for vdrteam-ppa + + -- Holger Schvestka Mon, 23 Nov 2009 17:06:03 +0100 + +vdr-plugin-control (0.0.2a-40) experimental; urgency=low + + * Removed non-standard shebang line from debian/rules + * Added README.source + * Standards-Version: 3.8.3 + * Fixed gcc 4.4 issue + + -- Tobias Grimm Wed, 11 Nov 2009 22:10:19 +0100 + +vdr-plugin-control (0.0.2a-39) experimental; urgency=low + + * Release for vdrdevel 1.7.6 + * Added ${misc:Depends} + * Bumped standards version to 3.8.1 + * Changed section to "video" + + -- Thomas Günther Wed, 29 Apr 2009 23:11:18 +0200 + +vdr-plugin-control (0.0.2a-38) experimental; urgency=low + + * Dropped patchlevel control field + * Build-Depend on vdr-dev (>=1.6.0-5) + * Bumped Standards-Version to 3.8.0 + * Switched Build-System to cdbs, Build-Depend on cdbs + * Using COMPAT=5 now + + -- Tobias Grimm Fri, 25 Jul 2008 15:52:57 +0200 + +vdr-plugin-control (0.0.2a-37) experimental; urgency=low + + * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7 + + -- Tobias Grimm Mon, 12 May 2008 00:55:55 +0200 + +vdr-plugin-control (0.0.2a-36) experimental; urgency=low + + * Build-Depend on vdr-dev (>= 1.6.0) + + -- Tobias Grimm Mon, 24 Mar 2008 20:14:06 +0100 + +vdr-plugin-control (0.0.2a-35) experimental; urgency=low + + * Force rebuild for vdr 1.5.15 + + -- Tobias Grimm Mon, 18 Feb 2008 21:32:30 +0100 + +vdr-plugin-control (0.0.2a-34) unstable; urgency=low + + * Release for vdrdevel 1.5.13 + + -- Thomas Günther Wed, 16 Jan 2008 10:31:44 +0100 + +vdr-plugin-control (0.0.2a-33) unstable; urgency=low + + * Release for vdrdevel 1.5.12 + + -- Thomas Günther Tue, 20 Nov 2007 23:46:39 +0100 + +vdr-plugin-control (0.0.2a-32) unstable; urgency=low + + * Release for vdrdevel 1.5.11 + + -- Thomas Günther Tue, 6 Nov 2007 23:34:29 +0100 + +vdr-plugin-control (0.0.2a-31) unstable; urgency=low + + * Release for vdrdevel 1.5.10 + + -- Thomas Günther Tue, 16 Oct 2007 23:51:09 +0200 + +vdr-plugin-control (0.0.2a-30) unstable; urgency=low + + * Release for vdrdevel 1.5.9 + + -- Thomas Günther Tue, 28 Aug 2007 01:01:20 +0200 + +vdr-plugin-control (0.0.2a-29) unstable; urgency=low + + * Release for vdrdevel 1.5.8 + + -- Thomas Günther Thu, 23 Aug 2007 01:09:19 +0200 + +vdr-plugin-control (0.0.2a-28) unstable; urgency=low + + * Release for vdrdevel 1.5.6 + + -- Thomas Günther Tue, 14 Aug 2007 01:46:31 +0200 + +vdr-plugin-control (0.0.2a-27) unstable; urgency=low + + * Release for vdrdevel 1.5.5 + + -- Thomas Günther Wed, 27 Jun 2007 23:02:55 +0200 + +vdr-plugin-control (0.0.2a-26) unstable; urgency=low + + * Release for vdrdevel 1.5.2 + + -- Thomas Günther Sat, 28 Apr 2007 00:00:59 +0200 + +vdr-plugin-control (0.0.2a-25) unstable; urgency=low + + * Added 02_gateway.dpatch to fix problems with VDR crashing when a telnet + session is ended with ctrl-c + + -- Tobias Grimm Thu, 12 Apr 2007 22:55:31 +0200 + +vdr-plugin-control (0.0.2a-24) unstable; urgency=low + + * Release for vdrdevel 1.5.1 + + -- Thomas Günther Tue, 27 Feb 2007 19:59:29 +0100 + +vdr-plugin-control (0.0.2a-23) unstable; urgency=low + + * Added 93_control-0.0.2a-1.5.0.dpatch + + -- Thomas Günther Sun, 21 Jan 2007 14:10:13 +0100 + +vdr-plugin-control (0.0.2a-22) unstable; urgency=low + + [ Thomas Günther ] + * Replaced VDRdevel adaptions in debian/rules with make-special-vdr + * Adapted call of dependencies.sh and patchlevel.sh to the new location + in /usr/share/vdr-dev/ + + [ Tobias Grimm ] + * Build-Depend on vdr-dev (>=1.4.5-1) + + -- Tobias Grimm Sun, 14 Jan 2007 18:54:35 +0100 + +vdr-plugin-control (0.0.2a-21) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.4-1) + + -- Tobias Grimm Sun, 5 Nov 2006 11:45:37 +0100 + +vdr-plugin-control (0.0.2a-20) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.3-1) + + -- Tobias Grimm Sat, 23 Sep 2006 20:32:54 +0200 + +vdr-plugin-control (0.0.2a-19) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.2-1) + * Bumped Standards-Version to 3.7.2 + + -- Tobias Grimm Sun, 27 Aug 2006 14:39:28 +0200 + +vdr-plugin-control (0.0.2a-18) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.1-1) + + -- Debian VDR Team Fri, 16 Jun 2006 21:27:51 +0200 + +vdr-plugin-control (0.0.2a-17) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.0-1) + + -- Debian VDR Team Wed, 3 May 2006 23:06:05 +0200 + +vdr-plugin-control (0.0.2a-16) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr (>=1.3.48-1) + - Added 90_APIVERSION.dpatch + + -- Debian VDR Team Mon, 24 Apr 2006 22:08:30 +0200 + +vdr-plugin-control (0.0.2a-15) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr (>=1.3.46-1) + + -- Debian VDR Team Wed, 12 Apr 2006 22:14:02 +0200 + +vdr-plugin-control (0.0.2a-14) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr (>=1.3.45-1) + + -- Debian VDR Team Mon, 27 Mar 2006 21:09:08 +0200 + +vdr-plugin-control (0.0.2a-13) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr (>=1.3.41-1) + + -- Debian VDR Team Sun, 26 Mar 2006 22:57:33 +0200 + +vdr-plugin-control (0.0.2a-12) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr (>=1.3.40-1) + + -- Debian VDR Team Wed, 25 Jan 2006 23:38:35 +0100 + +vdr-plugin-control (0.0.2a-11) unstable; urgency=low + + * Build-Depend on vdr (>=1.3.37-1) + + -- Tobias Grimm Sat, 3 Dec 2005 20:56:23 +0100 + +vdr-plugin-control (0.0.2a-10) unstable; urgency=low + + * Build-Depend on vdr (>=1.3.33-1) + + -- Tobias Grimm Sun, 2 Oct 2005 10:58:46 +0200 + +vdr-plugin-control (0.0.2a-9) unstable; urgency=low + + * Build-Depend on vdr (>=1.3.32-1) + + -- Tobias Grimm Wed, 14 Sep 2005 19:18:03 +0200 + +vdr-plugin-control (0.0.2a-8) unstable; urgency=low + + * Depend/Build-Depend on vdr (>=1.3.31-1) + * Conflict with vdr (>=1.3.31.99) + * Use dependencies.sh from vdr-dev to set vdr dependencies and + conflicts + + -- Tobias Grimm Tue, 30 Aug 2005 23:08:41 +0200 + +vdr-plugin-control (0.0.2a-7) unstable; urgency=low + + * Depend/Build-Depend on vdr (>=1.3.30-1) + * Conflict with vdr (>=1.3.30.99) + + -- Tobias Grimm Mon, 22 Aug 2005 17:26:45 +0200 + +vdr-plugin-control (0.0.2a-6) unstable; urgency=low + + * Depend/Build-Depend on vdr (>=1.3.29-1) + * Conflict with vdr (>=1.3.30) + + -- Tobias Grimm Mon, 15 Aug 2005 21:09:48 +0200 + +vdr-plugin-control (0.0.2a-5) unstable; urgency=low + + * Fixed vdr dependency to vdr (>=1.3.28-1) + + -- Tobias Grimm Sat, 13 Aug 2005 21:57:29 +0200 + +vdr-plugin-control (0.0.2a-3) unstable; urgency=low + + * Taken from vdrdevel by Thomas Günther + - Adapted patches for new dpatch >= 2.0.9 + - Using debian/compat now + - Deactivated plugin options - using defaults port 2002 now + - Removed makefile patch, which was only needed for VDR with AutoPid-Patch + - Added control-1.3.18 patch + * Depend/Build-Depend on vdr (>=1.3.28-1) + * Conflict with vdr (>=1.3.29) + * Bumped Standards-Version to 3.6.2 + * Made debian/rules svn-buildpackage-save + + -- Tobias Grimm Sat, 13 Aug 2005 00:20:30 +0200 + +vdr-plugin-control (0.0.2a-2) unstable; urgency=low + + * Added Makefile-fPIC-fix patch to fix potential FTBFS + * Adapted control file to alioth packages + * Using patchlevel.sh and custom control field "vdr-patchlevel" + * Removed debian/dirs + + -- Tobias Grimm Wed, 29 Sep 2004 21:20:00 +0200 + +vdr-plugin-control (0.0.2a-1) unstable; urgency=low + + * new upstream release + * added watch file + * recreated debian/rules + + -- Tobias Grimm Sun, 1 Aug 2004 15:15:00 +0200 + +vdr-plugin-control (0.0.1-2) unstable; urgency=low + + * changed default port number to 2005 + + -- Peter Siering Sun, 8 Feb 2004 11:00:00 +0200 + +vdr-plugin-control (0.0.1-1) unstable; urgency=low + + * integrated patchlevel info + * wrong preprocessor tokens in global.h fixed + + -- Rene Bartsch Tue, 28 Jan 2004 01:10:00 +0200 --- vdr-plugin-control-0.0.2a.orig/debian/patches/02_gateway.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/02_gateway.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_gateway.dpatch by Walter, dg9ep @ vdrportal.de +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes problems when ending a telnet session with ctrl-c +## DP: see: http://www.vdr-portal.de/board/thread.php?threadid=49680 + +@DPATCH@ +diff -urNad vdr-plugin-control-0.0.2a~/gateway.c vdr-plugin-control-0.0.2a/gateway.c +--- vdr-plugin-control-0.0.2a~/gateway.c 2004-07-02 21:24:22.000000000 +0200 ++++ vdr-plugin-control-0.0.2a/gateway.c 2007-04-12 22:51:16.000000000 +0200 +@@ -36,7 +36,7 @@ + _pTelnet (0), + _pFormatter (0) + { +- gl_CtrlGatewayCol.Add(this); ++// gl_CtrlGatewayCol.Add(this); + + // if (! cKbdRemoteForControl::_pRemote) + // cKbdRemoteForControl::_pRemote = new cKbdRemoteForControl(); +@@ -163,8 +163,8 @@ + + // UnprepareSocket(); + +- if (! _terminating) +- gl_CtrlGatewayCol.Del(this); ++// if (! _terminating) ++// gl_CtrlGatewayCol.Del(this); + + conDSYSLOG("gateway thread ended (pid=%d)", getpid()); + conLOG_GATEW("gateway thread ended (pid=%d)", getpid()); --- vdr-plugin-control-0.0.2a.orig/debian/patches/90_APIVERSION.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/90_APIVERSION.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh -e +## 90_APIVERSION.dpatch by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Support for the APIVERSION define as introduced in VDR-1.3.47. + +case "$1" in + -patch) + sed -i -e s/VDRVERSION/APIVERSION/g Makefile + ;; + -unpatch) + sed -i -e s/APIVERSION/VDRVERSION/g Makefile + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 + ;; +esac + +exit 0 --- vdr-plugin-control-0.0.2a.orig/debian/patches/93_control-0.0.2a-1.5.0.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/93_control-0.0.2a-1.5.0.dpatch @@ -0,0 +1,73 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 93_control-0.0.2a-1.5.0.dpatch by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5). + +@DPATCH@ +--- control-0.0.2a/gateway.c ++++ control-0.0.2a/gateway.c +@@ -100,7 +100,7 @@ + + if (_stack.poll(100)) { + +- uint64 Command = 0; ++ uint64_t Command = 0; + uint i = 0; + int t0 = time_ms(); + while (_active && i < sizeof(Command)) { +--- control-0.0.2a/keyboard.c ++++ control-0.0.2a/keyboard.c +@@ -18,7 +18,7 @@ + + struct tKbdMap { + eKbdFunc func; +- uint64 code; ++ uint64_t code; + }; + + +@@ -117,7 +117,7 @@ + + + +-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) { ++bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) { + + bool ret = cRemote::Put(Command, Repeat, Release); + conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command); +@@ -126,7 +126,7 @@ + + + +-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) { ++bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) { + + if (! _pRemote) + _pRemote = new cCtrlKeyboard(); +@@ -136,7 +136,7 @@ + + + +-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) { ++int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) { + + for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) { + if (p->code == Code) +--- control-0.0.2a/keyboard.h ++++ control-0.0.2a/keyboard.h +@@ -30,11 +30,11 @@ + cCtrlKeyboard(); + virtual ~cCtrlKeyboard(); + +- bool intPut(uint64 Command, bool Repeat, bool Release); ++ bool intPut(uint64_t Command, bool Repeat, bool Release); + + public: +- static bool Put(uint64 Command, bool Repeat = false, bool Release = false); +- static int MapCodeToFunc(uint64 Code); ++ static bool Put(uint64_t Command, bool Repeat = false, bool Release = false); ++ static int MapCodeToFunc(uint64_t Code); + }; + + --- vdr-plugin-control-0.0.2a.orig/debian/patches/00list +++ vdr-plugin-control-0.0.2a/debian/patches/00list @@ -0,0 +1,7 @@ +01_Makefile-fPIC-fix +02_gateway + +90_APIVERSION +92_control-1.3.18 +93_control-0.0.2a-1.5.0 +94_gcc-4.4 --- vdr-plugin-control-0.0.2a.orig/debian/patches/01_Makefile-fPIC-fix.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/01_Makefile-fPIC-fix.dpatch @@ -0,0 +1,20 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run + +## Makefile-fPIC-fix patch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds -fPIC to Makefile to fix potential FTBFS. + +@DPATCH@ +diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile +--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004 ++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004 +@@ -18,7 +18,7 @@ + ### The C++ compiler and options: + + CXX ?= g++ +-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual ++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual + + ### The directory environment: + --- vdr-plugin-control-0.0.2a.orig/debian/patches/94_gcc-4.4.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/94_gcc-4.4.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 94_gcc-4.4.dpatch by Tobias Grimm +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad vdr-plugin-control-0.0.2a~/formatter.c vdr-plugin-control-0.0.2a/formatter.c +--- vdr-plugin-control-0.0.2a~/formatter.c 2004-07-02 21:24:22.000000000 +0200 ++++ vdr-plugin-control-0.0.2a/formatter.c 2009-11-11 22:07:56.000000000 +0100 +@@ -165,7 +165,7 @@ + + if (Title) { + +- char* t = strchr(Title, '\t'); ++ const char* t = strchr(Title, '\t'); + if (t) { + + int size = t - Title; +@@ -300,7 +300,7 @@ + + for (;;) { + +- char* t = strchr(text, '\t'); ++ const char* t = strchr(text, '\t'); + if (t) { + // Tab found - check if the tab can be used + --- vdr-plugin-control-0.0.2a.orig/debian/patches/92_control-1.3.18.dpatch +++ vdr-plugin-control-0.0.2a/debian/patches/92_control-1.3.18.dpatch @@ -0,0 +1,35 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run + +## control-1.3.18 patch - by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.3.18. + +@DPATCH@ +--- control-0.0.2a/gateway.c ++++ control-0.0.2a/gateway.c +@@ -102,7 +102,12 @@ + + uint64 Command = 0; + uint i = 0; ++#if VDRVERSNUM >= 10318 ++ cTimeMs timeout; ++ timeout.Set(100); ++#else + int t0 = time_ms(); ++#endif + while (_active && i < sizeof(Command)) { + + uchar ch; +@@ -131,7 +136,11 @@ + // of their codes, so we'll need to wait some 100ms to see if + // there is more coming up - or whether this really is the 'ESC' + // key (if somebody knows how to clean this up, please let me know): ++#if VDRVERSNUM >= 10318 ++ if (Command == 0x1B && !timeout.TimedOut()) ++#else + if (Command == 0x1B && time_ms() - t0 < 100) ++#endif + continue; + + if (Command) {