r92 - in vdr/vdr-plugin-freecell/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 13:17:21 +0100
Author: tschmidt
Date: 2005-02-23 13:17:20 +0100 (Wed, 23 Feb 2005)
New Revision: 92
Added:
vdr/vdr-plugin-freecell/trunk/debian/
vdr/vdr-plugin-freecell/trunk/debian/changelog
vdr/vdr-plugin-freecell/trunk/debian/control
vdr/vdr-plugin-freecell/trunk/debian/copyright
vdr/vdr-plugin-freecell/trunk/debian/docs
vdr/vdr-plugin-freecell/trunk/debian/install
vdr/vdr-plugin-freecell/trunk/debian/links
vdr/vdr-plugin-freecell/trunk/debian/patches/
vdr/vdr-plugin-freecell/trunk/debian/patches/00list
vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch
vdr/vdr-plugin-freecell/trunk/debian/rules
vdr/vdr-plugin-freecell/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-freecell/trunk.
Added: vdr/vdr-plugin-freecell/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/changelog 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/changelog 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,65 @@
+vdr-plugin-freecell (0.0.2-2) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Build-depend on dpatch (>= 2.0.9)
+ - Converted existing dpatch-files to the new short format
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 26 Oct 2004 11:49:56 +0200
+
+vdr-plugin-freecell (0.0.2-1) unstable; urgency=low
+
+ * Tobias Grimm <tg@e-tobi.net>
+ - new upstream release
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 21 Sep 2004 20:16:00 +0200
+
+vdr-plugin-freecell (0.0.1-6) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Added patch from Andreas Jochens <aj@andaco.de> to be able to
+ compile the plugin with gcc-3.4 (closes: #271121)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 11 Sep 2004 16:02:14 +0200
+
+vdr-plugin-freecell (0.0.1-5) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Changed architecture to any
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> 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 <tg@e-tobi.net>
+ - plugin taken over by Debian VDR Team from c't VDR
+ - adapted patchlevel stuff to new vdr-patchlevel control field
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - 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 <pkg-vdr-dvb-devel@lists.alioth.debian.org> 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 <tom@toms-cafe.de> 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 <tom@toms-cafe.de> Sun, 27 Jun 2004 13:46:30 +0200
+
+vdr-plugin-freecell (0.0.1-1) unstable; urgency=low
+
+ * Initial Release
+
+ -- Thomas Günther <tom@toms-cafe.de> Sun, 21 Mar 2004 22:21:28 +0100
Added: vdr/vdr-plugin-freecell/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/control 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/control 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-freecell
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6), dpatch (>= 2.0.9)
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-freecell
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>= 1.2.6)
+Conflicts: vdr (>= 1.2.7)
+Description: Plugin to 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.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-freecell/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/copyright 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/copyright 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,11 @@
+This package was debianized by Thomas Günther <tom@toms-cafe.de> on
+Sun, 21 Mar 2004 22:21:28 +0100.
+
+It was downloaded from http://www.magoa.net/linux/index.php?view=freecell
+
+Upstream Author: Sascha Volkenandt <sascha at akv-soft dot de>
+
+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 .
Added: vdr/vdr-plugin-freecell/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/docs 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/docs 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-freecell/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/install 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/install 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,2 @@
+libvdr-freecell.so.* usr/lib/vdr/plugins/
+freecell usr/share/vdr-plugin-freecell/
Added: vdr/vdr-plugin-freecell/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/links 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/links 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1 @@
+usr/share/vdr-plugin-freecell/freecell /var/lib/vdr/plugins/freecell
Added: vdr/vdr-plugin-freecell/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/00list 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/00list 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+02_gcc3.4-fix
Added: vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## 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:
Added: vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,138 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 02_gcc3.4-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 from Andreas Jochens <aj@andaco.de>, 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<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
+- friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
++// friend cTBList<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
++// friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
+
+- friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
+- friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
+- friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
++// friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
++// friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
++// friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
+
+ /*friend cSource &operator<< <> (cSource &dest, const cTBList<T> &list);
+- friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
++// friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
+ };
+
+ // Template Implementation (inline funcs)
+
+ template<class T>
+ inline int cTBList<T>::Find (const T & i) {
+- cTBList<T>::cItem *item = m_First;
++ typename cTBList<T>::cItem *item = m_First;
+ int index = 0;
+
+ while (item && (item->Data != i)) {
+@@ -203,7 +203,7 @@
+
+ template<class T>
+ typename cTBList<T>::cItem *cTBList<T>::NewItem (cTBList<T>::cItem *pBefore, cTBList<T>::cItem *pAfter) const {
+- cTBList<T>::cItem *item = new cTBList<T>::cItem;
++ typename cTBList<T>::cItem *item = new typename cTBList<T>::cItem;
+
+ item->Next = pAfter;
+ item->Prev = pBefore;
+@@ -235,7 +235,7 @@
+ if ((int)idx == m_CurPos)
+ return m_Current;
+
+- cTBList<T>::cItem *item;
++ typename cTBList<T>::cItem *item;
+ int dist = idx - m_CurPos;
+ bool direct;
+
+@@ -271,7 +271,7 @@
+
+ template<class T>
+ T &cTBList<T>::Prepend () {
+- cTBList<T>::cItem *item = NewItem(NULL, m_First);
++ typename cTBList<T>::cItem *item = NewItem(NULL, m_First);
+
+ m_First = m_Current = item;
+ if (!m_Last)
+@@ -285,7 +285,7 @@
+
+ template<class T>
+ T &cTBList<T>::Append () {
+- cTBList<T>::cItem *item = NewItem(m_Last, NULL);
++ typename cTBList<T>::cItem *item = NewItem(m_Last, NULL);
+
+ m_Last = m_Current = item;
+ if (!m_First)
+@@ -317,13 +317,13 @@
+ return true;
+ }
+
+- cTBList<T>::cItem *nextItem = Locate(idx);
++ typename cTBList<T>::cItem *nextItem = Locate(idx);
+ if (!nextItem)
+ return false;
+
+- cTBList<T>::cItem *prevItem = nextItem->Prev;
++ typename cTBList<T>::cItem *prevItem = nextItem->Prev;
+
+- cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
++ typename cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
+ item->Data = i;
+
+ m_CurPos = idx;
+@@ -338,7 +338,7 @@
+ if (!m_Current)
+ return NULL;
+
+- cTBList<T>::cItem *item = m_Current;
++ typename cTBList<T>::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<T>::cItem *item = Unlink();
++ typename cTBList<T>::cItem *item = Unlink();
+ if (!item)
+ return false;
+
+@@ -383,7 +383,7 @@
+ if (!Locate(idx))
+ return false;
+
+- cTBList<T>::cItem *item = Unlink();
++ typename cTBList<T>::cItem *item = Unlink();
+ if (!item)
+ return false;
+
+@@ -412,13 +412,13 @@
+
+ template<class T>
+ void cTBList<T>::Clear () {
+- cTBList<T>::cItem *item = m_First;
++ typename cTBList<T>::cItem *item = m_First;
+
+ m_First = m_Last = m_Current = NULL;
+ m_Count = 0;
+ m_CurPos = -1;
+
+- cTBList<T>::cItem *Prev;
++ typename cTBList<T>::cItem *Prev;
+ while (item) {
+ Prev = item;
+ item = item->Next;
Added: vdr/vdr-plugin-freecell/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/rules 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/rules 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,98 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+VDR=vdr
+VDRDIR=/usr/include/$(VDR)
+PACKAGE=$(VDR)-plugin-freecell
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all DVBDIR=/usr VDRDIR=$(VDRDIR) LIBDIR=.
+ touch build-stamp
+
+clean: clean1 unpatch
+clean1:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ [ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
+ [ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean1 patch unpatch
Property changes on: vdr/vdr-plugin-freecell/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-freecell/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/watch 2005-02-23 12:16:58 UTC (rev 91)
+++ vdr/vdr-plugin-freecell/trunk/debian/watch 2005-02-23 12:17:20 UTC (rev 92)
@@ -0,0 +1,2 @@
+version=2
+http://www.magoa.net/linux/index.php?view=freecell .*/vdr-freecell-(.*)\.tgz