--- vdr-plugin-freecell-0.0.2.orig/debian/watch +++ vdr-plugin-freecell-0.0.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://linux.kompiliert.net/index.php?view=freecell .*/vdr-freecell-(.*)\.tgz --- vdr-plugin-freecell-0.0.2.orig/debian/rules +++ vdr-plugin-freecell-0.0.2/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=. + +common-build-arch:: + $(MAKE) all $(MAKE_OPTIONS) + +clean:: + $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) + rm -f libvdr-*.so.* + +common-binary-predeb-arch:: + sh /usr/share/vdr-dev/dependencies.sh + --- vdr-plugin-freecell-0.0.2.orig/debian/copyright +++ vdr-plugin-freecell-0.0.2/debian/copyright @@ -0,0 +1,38 @@ +Upstream Homepage: + http://linux.kompiliert.net/index.php?view=freecell + +Upstream Author: + Sascha Volkenandt + +Debian Maintainers: + Tobias Grimm + Thomas Günther + Thomas Schmidt + +Copyright: + (C) 2004 Sascha Volkenandt + +Copyright (Debian packaging): + (C) 2004 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + The complete text of the GNU General Public License can be found + in /usr/share/common-licenses/GPL-2 on most Debian systems. + +License (Debian packaging): + The Debian packaging is licensed under the GPL, version 2 or any + later version, see /usr/share/common-licenses/GPL-2. --- vdr-plugin-freecell-0.0.2.orig/debian/compat +++ vdr-plugin-freecell-0.0.2/debian/compat @@ -0,0 +1 @@ +5 --- vdr-plugin-freecell-0.0.2.orig/debian/changelog +++ vdr-plugin-freecell-0.0.2/debian/changelog @@ -0,0 +1,434 @@ +vdr-plugin-freecell (0.0.2-53yavdr1) lucid; urgency=low + + * reb. vdr-1.7.14 + + -- Holger Schvestka Mon, 15 Mar 2010 22:24:50 +0100 + +vdr-plugin-freecell (0.0.2-52yavdr1) karmic; urgency=low + + * reb. vdr-1.7.12 + + -- Holger Schvestka Sun, 21 Feb 2010 19:56:32 +0100 + +vdr-plugin-freecell (0.0.2-51yavdr1) karmic; urgency=low + + * reb. vdr-1.7.12 + + -- Holger Schvestka Thu, 18 Feb 2010 13:20:24 +0100 + +vdr-plugin-freecell (0.0.2-49tvt1) karmic; urgency=low + + * updated ABI version + + -- Gerald Dachs Fri, 25 Dec 2009 21:02:42 +0100 + +vdr-plugin-freecell (0.0.2-48tvt1) karmic; urgency=low + + * rebuild for vdr 1.7.10 + + -- Gerald Dachs Tue, 24 Nov 2009 15:38:12 +0100 + +vdr-plugin-freecell (0.0.2-47ubuntu1) karmic; urgency=low + + * Ubuntu-Karmic Release + + -- Holger Schvestka Sun, 27 Sep 2009 01:10:43 +0200 + +vdr-plugin-freecell (0.0.2-46) unstable; urgency=low + + * Release for vdrdevel 1.7.6 + * Added ${misc:Depends} + * Bumped standards version to 3.8.1 + * Updated debian/copyright + * Updated debian/watch + * Changed section to "video" + + -- Thomas Günther Wed, 29 Apr 2009 23:10:53 +0200 + +vdr-plugin-freecell (0.0.2-45) unstable; urgency=low + + [ Tobias Grimm ] + * Dropped patchlevel control field + * Build-Depend on vdr-dev (>=1.6.0-5) + * Bumped Standards-Version to 3.8.0 + * Using COMPAT=5 now + + -- Thomas Schmidt Sat, 19 Jul 2008 17:38:18 +0200 + +vdr-plugin-freecell (0.0.2-44) unstable; urgency=low + + * Upload to unstable + + -- Thomas Schmidt Sun, 08 Jun 2008 23:19:00 +0200 + +vdr-plugin-freecell (0.0.2-43) experimental; urgency=low + + * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7 + + -- Tobias Grimm Mon, 12 May 2008 12:57:30 +0200 + +vdr-plugin-freecell (0.0.2-42) experimental; urgency=low + + [ Thomas Schmidt ] + * Build-Depend on vdr-dev (>=1.6.0) + * Switched Build-System to cdbs, Build-Depend on cdbs + * Added Homepage field to debian/control + * Renamed XS-Vcs-* fields to Vcs-* in debian/control + * Bumped Standards-Version to 3.7.3 + * Updated debian/copyright to our new format + + -- Tobias Grimm Thu, 03 Apr 2008 23:40:59 +0200 + +vdr-plugin-freecell (0.0.2-41) experimental; urgency=low + + * Force rebuild for vdr 1.5.15 + + -- Tobias Grimm Mon, 18 Feb 2008 21:07:59 +0100 + +vdr-plugin-freecell (0.0.2-40) unstable; urgency=low + + * Release for vdrdevel 1.5.13 + + -- Thomas Günther Wed, 16 Jan 2008 10:31:32 +0100 + +vdr-plugin-freecell (0.0.2-39) unstable; urgency=low + + * Release for vdrdevel 1.5.12 + + -- Thomas Günther Tue, 20 Nov 2007 23:46:17 +0100 + +vdr-plugin-freecell (0.0.2-38) unstable; urgency=low + + * Release for vdrdevel 1.5.11 + + -- Thomas Günther Tue, 6 Nov 2007 23:34:11 +0100 + +vdr-plugin-freecell (0.0.2-37) unstable; urgency=low + + * Release for vdrdevel 1.5.10 + + -- Thomas Günther Tue, 16 Oct 2007 23:50:53 +0200 + +vdr-plugin-freecell (0.0.2-36) unstable; urgency=low + + * Release for vdrdevel 1.5.9 + + -- Thomas Günther Tue, 28 Aug 2007 01:01:03 +0200 + +vdr-plugin-freecell (0.0.2-35) unstable; urgency=low + + * Release for vdrdevel 1.5.8 + + -- Thomas Günther Thu, 23 Aug 2007 01:08:59 +0200 + +vdr-plugin-freecell (0.0.2-34) unstable; urgency=low + + * Release for vdrdevel 1.5.6 + + -- Thomas Günther Tue, 14 Aug 2007 01:46:13 +0200 + +vdr-plugin-freecell (0.0.2-33) unstable; urgency=low + + * Release for vdrdevel 1.5.5 + * Added 93_freecell-0.0.2-1.5.4.dpatch + + -- Thomas Günther Wed, 27 Jun 2007 23:43:26 +0200 + +vdr-plugin-freecell (0.0.2-32) unstable; urgency=low + + * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control + * Removed version from Build-Dependancy to dpatch - even Sarge has the + required version + + -- Thomas Schmidt Mon, 28 May 2007 19:40:25 +0200 + +vdr-plugin-freecell (0.0.2-31) experimental; urgency=low + + * Release for vdrdevel 1.5.2 + + -- Thomas Günther Sat, 28 Apr 2007 00:00:26 +0200 + +vdr-plugin-freecell (0.0.2-30) experimental; urgency=low + + * Release for vdrdevel 1.5.1 + * Added myself to Uploaders + + -- Thomas Günther Tue, 27 Feb 2007 19:59:14 +0100 + +vdr-plugin-freecell (0.0.2-29) experimental; 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/ + * Using debian/compat now + + [ Tobias Grimm ] + * Build-Depend on vdr-dev (>=1.4.5-1) + + -- Tobias Grimm Sun, 14 Jan 2007 20:24:25 +0100 + +vdr-plugin-freecell (0.0.2-28) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.4-1) + + -- Tobias Grimm Sun, 5 Nov 2006 13:46:52 +0100 + +vdr-plugin-freecell (0.0.2-27) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.3-1) + + -- Thomas Schmidt Wed, 27 Sep 2006 08:26:14 +0200 + +vdr-plugin-freecell (0.0.2-26) unstable; urgency=low + + * Bumped Standards-Version to 3.7.2 + * Added note about the Debian Maintainers to debian/copyright + * Build-Depend on vdr-dev (>=1.4.2-1) + + -- Thomas Schmidt Mon, 28 Aug 2006 20:58:41 +0200 + +vdr-plugin-freecell (0.0.2-25) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.1-1) + + -- Debian VDR Team Sun, 18 Jun 2006 15:54:36 +0200 + +vdr-plugin-freecell (0.0.2-24) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.0-1) + + -- Debian VDR Team Sun, 30 Apr 2006 21:19:26 +0200 + +vdr-plugin-freecell (0.0.2-23) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.48-1) + * Tobias Grimm + - Added 90_APIVERSION.dpatch + + -- Debian VDR Team Mon, 24 Apr 2006 20:17:28 +0200 + +vdr-plugin-freecell (0.0.2-22) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.46-1) + + -- Debian VDR Team Thu, 13 Apr 2006 00:29:26 +0200 + +vdr-plugin-freecell (0.0.2-21) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.45-1) + + -- Debian VDR Team Mon, 27 Mar 2006 23:18:25 +0200 + +vdr-plugin-freecell (0.0.2-20) unstable; urgency=low + + * Tobias Grimm + - Depend/Build-Depend on vdr (>=1.3.41-1) + + -- Debian VDR Team Tue, 31 Jan 2006 20:03:24 +0100 + +vdr-plugin-freecell (0.0.2-19) unstable; urgency=low + + * Tobias Grimm + - Build-Depend on vdr-dev (>=1.3.40-1) + + -- Debian VDR Team Thu, 26 Jan 2006 19:11:52 +0100 + +vdr-plugin-freecell (0.0.2-18) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.39-1) + + -- Debian VDR Team Sun, 22 Jan 2006 12:32:44 +0100 + +vdr-plugin-freecell (0.0.2-17) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.38-1) + + -- Debian VDR Team Thu, 12 Jan 2006 16:32:52 +0100 + +vdr-plugin-freecell (0.0.2-16) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.37-1) + + -- Debian VDR Team Tue, 29 Nov 2005 15:13:52 +0100 + +vdr-plugin-freecell (0.0.2-15) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.35-1) + + -- Debian VDR Team Wed, 2 Nov 2005 20:01:39 +0100 + +vdr-plugin-freecell (0.0.2-14) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.33-1) + + -- Debian VDR Team Sun, 2 Oct 2005 12:15:55 +0200 + +vdr-plugin-freecell (0.0.2-13) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.32-1) + + -- Debian VDR Team Sun, 11 Sep 2005 18:45:59 +0200 + +vdr-plugin-freecell (0.0.2-12) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.31-1) + - Use dependencies.sh from vdr-dev to set vdr dependencies and + conflicts to the right vdr version when building the package + + -- Debian VDR Team Fri, 2 Sep 2005 17:57:41 +0200 + +vdr-plugin-freecell (0.0.2-11) unstable; urgency=low + + * Tobias Grimm + - Depend/Build-Depend on vdr (>=1.3.30-1) + - Conflict with vdr (>=1.3.30.99) + + -- Debian VDR Team Tue, 23 Aug 2005 19:19:44 +0200 + +vdr-plugin-freecell (0.0.2-10) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.29-1) + - Conflict with vdr (>=1.3.29.99) + + -- Debian VDR Team Mon, 15 Aug 2005 19:21:14 +0200 + +vdr-plugin-freecell (0.0.2-9) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.28-1) + - Conflict with vdr (>=1.3.29) + + -- Debian VDR Team Tue, 9 Aug 2005 22:13:07 +0200 + +vdr-plugin-freecell (0.0.2-8) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.27-1) + - Conflict with vdr (>=1.3.28) + - Bumped Standards-Version to 3.6.2 + + -- Debian VDR Team Wed, 29 Jun 2005 17:38:34 +0200 + +vdr-plugin-freecell (0.0.2-7) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.26-1) + - Conflict with vdr (>=1.3.27) + + -- Debian VDR Team Sun, 12 Jun 2005 17:03:10 +0200 + +vdr-plugin-freecell (0.0.2-6) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.25-1) + - Conflict with vdr (>=1.3.26) + + -- Debian VDR Team Tue, 31 May 2005 14:43:17 +0200 + +vdr-plugin-freecell (0.0.2-5) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.24-1) + - Conflict with vdr (>=1.3.25) + + -- Debian VDR Team Mon, 9 May 2005 17:18:55 +0200 + +vdr-plugin-freecell (0.0.2-4) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.23-1) + - Conflict with vdr (>=1.3.24) + - Added 92_freecell-1.3.18.dpatch from vdrdevel to make it + possible to compile the plugin with vdr (>=1.3.18) + + -- Debian VDR Team Sun, 24 Apr 2005 16:47:09 +0200 + +vdr-plugin-freecell (0.0.2-3) unstable; urgency=low + + * Thomas Schmidt + - Use patchlevel.sh subst in debian/rules not the old code, + therefore Build-Depend on vdr (>=1.2.6-7) + - Cleanup debian/rules a little bit + - Changed my email-address to the debian one + + -- Debian VDR Team Sat, 26 Mar 2005 17:16:52 +0100 + +vdr-plugin-freecell (0.0.2-2) unstable; urgency=low + + * Thomas Schmidt + - Build-depend on dpatch (>= 2.0.9) + - Converted existing dpatch-files to the new short format + + -- Debian VDR Team Tue, 26 Oct 2004 11:49:56 +0200 + +vdr-plugin-freecell (0.0.2-1) unstable; urgency=low + + * Tobias Grimm + - new upstream release + + -- Debian VDR Team Tue, 21 Sep 2004 20:16:00 +0200 + +vdr-plugin-freecell (0.0.1-6) unstable; urgency=low + + * Thomas Schmidt + - Added patch from Andreas Jochens to be able to + compile the plugin with gcc-3.4 (closes: #271121) + + -- Debian VDR Team Sat, 11 Sep 2004 16:02:14 +0200 + +vdr-plugin-freecell (0.0.1-5) unstable; urgency=low + + * Thomas Schmidt + - Changed architecture to any + + -- Debian VDR Team Wed, 18 Aug 2004 00:18:07 +0200 + +vdr-plugin-freecell (0.0.1-4) unstable; urgency=low + + * First upload to the archive (closes: #262894) + * Tobias Grimm + - plugin taken over by Debian VDR Team from c't VDR + - adapted patchlevel stuff to new vdr-patchlevel control field + * Thomas Schmidt + - Converted debian/changelog into UTF8 + - Card-Images are now placed under /usr/share/vdr-plugin-freecell and + linked to /var/lib/vdr/plugins/freecell + - Use dpatch, so build-dep on dpatch + - Add 01_Makefile-fPIC-fix.dpatch + - Added myself as Uploader + + -- Debian VDR Team Sun, 01 Aug 2004 13:51:00 +0200 + +vdr-plugin-freecell (0.0.1-3) unstable; urgency=low + + * Fixed syntax of make clean call + + -- Thomas Günther Tue, 29 Jun 2004 11:08:03 +0200 + +vdr-plugin-freecell (0.0.1-2) unstable; urgency=low + + * Fixed debhelper version in Build-Depends + * Added debian/watch file for uscan + * Removed debian/dirs + + -- Thomas Günther Sun, 27 Jun 2004 13:46:30 +0200 + +vdr-plugin-freecell (0.0.1-1) unstable; urgency=low + + * Initial Release + + -- Thomas Günther Sun, 21 Mar 2004 22:21:28 +0100 --- vdr-plugin-freecell-0.0.2.orig/debian/install +++ vdr-plugin-freecell-0.0.2/debian/install @@ -0,0 +1,2 @@ +libvdr-freecell.so.* usr/lib/vdr/plugins/ +freecell usr/share/vdr-plugin-freecell/ --- vdr-plugin-freecell-0.0.2.orig/debian/docs +++ vdr-plugin-freecell-0.0.2/debian/docs @@ -0,0 +1 @@ +README --- vdr-plugin-freecell-0.0.2.orig/debian/links +++ vdr-plugin-freecell-0.0.2/debian/links @@ -0,0 +1 @@ +usr/share/vdr-plugin-freecell/freecell /var/lib/vdr/plugins/freecell --- vdr-plugin-freecell-0.0.2.orig/debian/control +++ vdr-plugin-freecell-0.0.2/debian/control @@ -0,0 +1,17 @@ +Source: vdr-plugin-freecell +Section: video +Priority: extra +Maintainer: Debian VDR Team +Uploaders: Tobias Grimm , Thomas Schmidt , Thomas Günther +Build-Depends: debhelper (>> 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5) +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/ +Homepage: http://linux.kompiliert.net/index.php?view=freecell + +Package: vdr-plugin-freecell +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} +Description: Plugin for VDR that implements the card game "Freecell" + This Freecell plugin is an implementation of the (well-known) card game + "Freecell" played on the On Screen Display of your Video Disk Recorder. --- vdr-plugin-freecell-0.0.2.orig/debian/patches/93_freecell-0.0.2-1.5.4.dpatch +++ vdr-plugin-freecell-0.0.2/debian/patches/93_freecell-0.0.2-1.5.4.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 93_freecell-0.0.2-1.5.4.dpatch by Thomas Günther +## http://toms-cafe.de/vdr/download/freecell-0.0.2-1.5.4.diff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.4. + +@DPATCH@ +--- freecell-0.0.2/tools/list.h ++++ freecell-0.0.2/tools/list.h +@@ -523,7 +523,7 @@ + return neu; + } + +-typedef class cTBList cStringList; ++//typedef class cTBList cStringList; + typedef class cTBList cPtrList; + + // Special Overrides for String lists --- vdr-plugin-freecell-0.0.2.orig/debian/patches/90_APIVERSION.dpatch +++ vdr-plugin-freecell-0.0.2/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-freecell-0.0.2.orig/debian/patches/02_gcc3.4-fix.dpatch +++ vdr-plugin-freecell-0.0.2/debian/patches/02_gcc3.4-fix.dpatch @@ -0,0 +1,138 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +## 02_gcc3.4-fix.dpatch by Thomas Schmidt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix from Andreas Jochens , to compile the plugin +## DP: with gcc-3.4 + +@DPATCH@ +diff -urNad /home/chelli/vdr/cvs/vdr/vdr-plugin-freecell/tools/list.h vdr-plugin-freecell/tools/list.h +--- /home/chelli/vdr/cvs/vdr/vdr-plugin-freecell/tools/list.h 2004-02-11 13:33:26.000000000 +0100 ++++ vdr-plugin-freecell/tools/list.h 2004-09-11 16:00:20.000000000 +0200 +@@ -90,22 +90,22 @@ + T &SetNextCurrent (); + T &SetPrevCurrent (); + +- friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); +- friend cTBList &operator+= <> (cTBList &list, const T &element); ++// friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); ++// friend cTBList &operator+= <> (cTBList &list, const T &element); + +- friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); +- friend cTBList operator+ <> (const T &element, const cTBList &list); +- friend cTBList operator+ <> (const cTBList &list, const T &element); ++// friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); ++// friend cTBList operator+ <> (const T &element, const cTBList &list); ++// friend cTBList operator+ <> (const cTBList &list, const T &element); + + /*friend cSource &operator<< <> (cSource &dest, const cTBList &list); +- friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ ++// friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ + }; + + // Template Implementation (inline funcs) + + template + inline int cTBList::Find (const T & i) { +- cTBList::cItem *item = m_First; ++ typename cTBList::cItem *item = m_First; + int index = 0; + + while (item && (item->Data != i)) { +@@ -203,7 +203,7 @@ + + template + typename cTBList::cItem *cTBList::NewItem (cTBList::cItem *pBefore, cTBList::cItem *pAfter) const { +- cTBList::cItem *item = new cTBList::cItem; ++ typename cTBList::cItem *item = new typename cTBList::cItem; + + item->Next = pAfter; + item->Prev = pBefore; +@@ -235,7 +235,7 @@ + if ((int)idx == m_CurPos) + return m_Current; + +- cTBList::cItem *item; ++ typename cTBList::cItem *item; + int dist = idx - m_CurPos; + bool direct; + +@@ -271,7 +271,7 @@ + + template + T &cTBList::Prepend () { +- cTBList::cItem *item = NewItem(NULL, m_First); ++ typename cTBList::cItem *item = NewItem(NULL, m_First); + + m_First = m_Current = item; + if (!m_Last) +@@ -285,7 +285,7 @@ + + template + T &cTBList::Append () { +- cTBList::cItem *item = NewItem(m_Last, NULL); ++ typename cTBList::cItem *item = NewItem(m_Last, NULL); + + m_Last = m_Current = item; + if (!m_First) +@@ -317,13 +317,13 @@ + return true; + } + +- cTBList::cItem *nextItem = Locate(idx); ++ typename cTBList::cItem *nextItem = Locate(idx); + if (!nextItem) + return false; + +- cTBList::cItem *prevItem = nextItem->Prev; ++ typename cTBList::cItem *prevItem = nextItem->Prev; + +- cTBList::cItem *item = NewItem(prevItem, nextItem); ++ typename cTBList::cItem *item = NewItem(prevItem, nextItem); + item->Data = i; + + m_CurPos = idx; +@@ -338,7 +338,7 @@ + if (!m_Current) + return NULL; + +- cTBList::cItem *item = m_Current; ++ typename cTBList::cItem *item = m_Current; + if (item == m_First) { + if (m_First = item->Next) + m_First->Prev = NULL; +@@ -370,7 +370,7 @@ + if (Find(i) == -1) + return false; + +- cTBList::cItem *item = Unlink(); ++ typename cTBList::cItem *item = Unlink(); + if (!item) + return false; + +@@ -383,7 +383,7 @@ + if (!Locate(idx)) + return false; + +- cTBList::cItem *item = Unlink(); ++ typename cTBList::cItem *item = Unlink(); + if (!item) + return false; + +@@ -412,13 +412,13 @@ + + template + void cTBList::Clear () { +- cTBList::cItem *item = m_First; ++ typename cTBList::cItem *item = m_First; + + m_First = m_Last = m_Current = NULL; + m_Count = 0; + m_CurPos = -1; + +- cTBList::cItem *Prev; ++ typename cTBList::cItem *Prev; + while (item) { + Prev = item; + item = item->Next; --- vdr-plugin-freecell-0.0.2.orig/debian/patches/01_Makefile-fPIC-fix.dpatch +++ vdr-plugin-freecell-0.0.2/debian/patches/01_Makefile-fPIC-fix.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds -fPIC to Makefile + +@DPATCH@ +diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-freecell/vdr-plugin-freecell-0.0.1/Makefile vdr-plugin-freecell-0.0.1/Makefile +--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-freecell/vdr-plugin-freecell-0.0.1/Makefile 2004-03-21 01:54:39.000000000 +0100 ++++ vdr-plugin-freecell-0.0.1/Makefile 2004-08-09 15:02:51.000000000 +0200 +@@ -54,7 +54,7 @@ + DEFINES += -DTOOLBOX_DEBUG -DDEBUG + CXXFLAGS += -g + else +- CXXFLAGS += -O2 ++ CXXFLAGS += -fPIC -O2 + endif + + ### Implicit rules: --- vdr-plugin-freecell-0.0.2.orig/debian/patches/00list +++ vdr-plugin-freecell-0.0.2/debian/patches/00list @@ -0,0 +1,6 @@ +01_Makefile-fPIC-fix +02_gcc3.4-fix + +90_APIVERSION.dpatch +92_freecell-1.3.18 +93_freecell-0.0.2-1.5.4 --- vdr-plugin-freecell-0.0.2.orig/debian/patches/92_freecell-1.3.18.dpatch +++ vdr-plugin-freecell-0.0.2/debian/patches/92_freecell-1.3.18.dpatch @@ -0,0 +1,22 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run + +## freecell-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@ +--- freecell-0.0.2/cards.c ++++ freecell-0.0.2/cards.c +@@ -52,7 +52,11 @@ + mX = X; + mY = Y; + mStacked = Stacked; ++#if VDRVERSNUM >= 10318 ++ mSeed = cTimeMs::Now(); ++#else + mSeed = time_ms(); ++#endif + } + + cCardStack::~cCardStack() {