r3779 - in vdr/vdr-plugin-text2skin/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Jan 7 01:31:48 CET 2007
Author: tiber-guest
Date: 2007-01-07 01:31:48 +0100 (Sun, 07 Jan 2007)
New Revision: 3779
Added:
vdr/vdr-plugin-text2skin/trunk/debian/
vdr/vdr-plugin-text2skin/trunk/debian/changelog
vdr/vdr-plugin-text2skin/trunk/debian/compat
vdr/vdr-plugin-text2skin/trunk/debian/control
vdr/vdr-plugin-text2skin/trunk/debian/copyright
vdr/vdr-plugin-text2skin/trunk/debian/docs
vdr/vdr-plugin-text2skin/trunk/debian/examples
vdr/vdr-plugin-text2skin/trunk/debian/install
vdr/vdr-plugin-text2skin/trunk/debian/patches/
vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch
vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch
vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch
vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch
vdr/vdr-plugin-text2skin/trunk/debian/rules
vdr/vdr-plugin-text2skin/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: vdr/vdr-plugin-text2skin/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,364 @@
+vdr-plugin-text2skin (1.0+cvs20050618-25) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 5 Nov 2006 12:06:03 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-24) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.4-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 5 Nov 2006 11:45:44 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-23) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.3-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 23 Sep 2006 20:33:01 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-22) unstable; urgency=low
+
+ * Added 93_libfreetype6-2.2.1.dpatch (Thx to DrSat at vdrportal.de and Jerome)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 4 Sep 2006 20:39:26 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-21) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.2-1)
+ * Bumped Standards-Version to 3.7.2
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 27 Aug 2006 14:39:36 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-20) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.1-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Fri, 16 Jun 2006 22:10:32 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-19) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.0-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 3 May 2006 23:08:59 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-18) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.48-1)
+ - Added 90_APIVERSION.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 24 Apr 2006 22:08:35 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-17) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.3.47-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 20 Apr 2006 08:30:19 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-16) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.46-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 12 Apr 2006 22:14:09 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-15) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.45-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 27 Mar 2006 21:33:25 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-14) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.41-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Tue, 31 Jan 2006 01:40:53 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-13) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Added 92_vdr-1.3.38.dpatch
+ - Build-Depend on vdr-dev (>=1.3.40-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 26 Jan 2006 14:29:38 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-12) unstable; urgency=low
+
+ * Added libmagick++9-dev to dependencies
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 5 Dec 2005 22:59:03 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-11) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.37-1)
+ * Thomas Günther <tom at toms-cafe.de>
+ - Added 91_cvs-20051107.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 3 Dec 2005 20:56:29 +0100
+
+vdr-plugin-text2skin (1.0+cvs20050618-10) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.33-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 2 Oct 2005 10:34:08 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-9) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.32-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 14 Sep 2005 19:17:58 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-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 <tg at e-tobi.net> Tue, 30 Aug 2005 23:07:14 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-7) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.30-1)
+ * Conflict with vdr (>=1.3.30.99)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 22 Aug 2005 17:31:43 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-6) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.29-1)
+ * Conflict with vdr (>=1.3.30)
+ * Added vdr-skins to Suggests
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 9 Aug 2005 18:12:52 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-5) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.28-1)
+ * Conflict with vdr (>=1.3.29)
+ * Bumped Standards-Version to 3.6.2
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 8 Aug 2005 20:25:57 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-4) unstable; urgency=low
+
+ * Fixed typo in vdr dependency
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 26 Jun 2005 19:40:56 +0200
+
+vdr-plugin-text2skin (1.0+cvs20050618-3) unstable; urgency=low
+
+ * vdrdevel -> vdr
+ * Depend/Build-Depend on vdr (>=1.3.27-1)
+ * Conflict with vdr (>=1.3.28)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 26 Jun 2005 19:26:35 +0200
+
+vdrdevel-plugin-text2skin (1.0+cvs20050618-2) unstable; urgency=low
+
+ * VDR-1.3.27
+
+ -- Thomas Günther <tom at toms-cafe.de> Tue, 21 Jun 2005 00:21:22 +0200
+
+vdrdevel-plugin-text2skin (1.0+cvs20050618-1) unstable; urgency=low
+
+ * New upstream cvs release
+ * Removed cvs-2005.01.22.23.39.40 patch
+ * Removed fixed_digit_width patch
+ * Removed progress-bar-tab patch
+ * Changed dependency to vdrdevel (>= 1.3.25)
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 18 Jun 2005 21:05:58 +0200
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-10) unstable; urgency=low
+
+ * VDR-1.3.26
+ * Upgraded 95_vdrdevel.dpatch to version 0.1.0
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 17 Jun 2005 12:49:57 +0200
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-9) unstable; urgency=low
+
+ * VDR-1.3.25
+ * Upgraded 95_vdrdevel.dpatch to version 0.0.9
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 30 May 2005 23:56:53 +0200
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-8) unstable; urgency=low
+
+ * VDR-1.3.24
+
+ -- Thomas Günther <tom at toms-cafe.de> Tue, 10 May 2005 02:41:39 +0200
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-7) unstable; urgency=low
+
+ * VDR-1.3.23
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 20 Mar 2005 23:27:30 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-6) unstable; urgency=low
+
+ * VDR-1.3.22-4
+
+ -- Thomas Günther <tom at toms-cafe.de> Thu, 10 Mar 2005 01:49:33 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-5) unstable; urgency=low
+
+ * VDR-1.3.22
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 28 Feb 2005 02:42:07 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-4) unstable; urgency=low
+
+ * VDR-1.3.21
+
+ -- Thomas Günther <tom at toms-cafe.de> Tue, 15 Feb 2005 17:37:25 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-3) unstable; urgency=low
+
+ * VDR-1.3.20
+ * Updated 95_vdrdevel.dpatch to version 0.0.8
+
+ -- Thomas Günther <tom at toms-cafe.de> Tue, 8 Feb 2005 11:33:59 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-2) unstable; urgency=low
+
+ * VDR-1.3.19
+ * Updated 95_vdrdevel.dpatch to version 0.0.7
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 23 Jan 2005 22:48:20 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc2-1) unstable; urgency=low
+
+ * New upstream release (1.0 release candidate 2 from
+ http://www.magoa.net/linux/contrib/vdr-text2skin-1.0-rc2.tgz)
+ * Removed cvs-2005.01.17.03.17.01 patch
+ * Added cvs-2005.01.22.23.39.40 patch
+ * Added fixed_digit_width patch
+ * Added progress-bar-tab patch
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 22 Jan 2005 23:29:29 +0100
+
+vdrdevel-plugin-text2skin (0.9+1.0rc1-1) unstable; urgency=low
+
+ * VDR 1.3.18
+ * New upstream release (1.0 release candidate 1 from
+ http://www.magoa.net/linux/contrib/vdr-text2skin-1.0-rc1.tgz)
+ * New upstream release
+ * Added cvs-2005.01.17.03.17.01 patch
+ * Updated 95_vdrdevel.dpatch to version 0.0.6
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 17 Jan 2005 23:35:46 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-6) unstable; urgency=low
+
+ * vdrdevel-1.3.17-5: changed patchlevel
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 3 Jan 2005 16:28:20 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-5) unstable; urgency=low
+
+ * VDR 1.3.17
+ * Converted changelog to UTF-8
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 22 Nov 2004 02:49:35 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-4) unstable; urgency=low
+
+ * Build-Depends to libmagick++-dev for sarge & woody-backport
+
+ -- Thomas Günther <tom at toms-cafe.de> Wed, 17 Nov 2004 01:05:48 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-3) unstable; urgency=low
+
+ * VDR 1.3.16
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 14 Nov 2004 21:41:34 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-2) unstable; urgency=low
+
+ * VDR 1.3.15
+
+ -- Thomas Günther <tom at toms-cafe.de> Tue, 2 Nov 2004 01:38:39 +0100
+
+vdrdevel-plugin-text2skin (0.0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Thomas Günther <tom at toms-cafe.de> Thu, 28 Oct 2004 01:03:21 +0200
+
+vdrdevel-plugin-text2skin (0.0.8-3) unstable; urgency=low
+
+ * VDR 1.3.14
+ * Adapted patches for new dpatch >= 2.0.9
+ * Changed Build-Depends to libmagick++-dev-5.5.7 to fix color errors
+ * Updated 95_vdrdevel.dpatch to version 0.0.5
+ * Using debian/compat now
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 24 Oct 2004 03:21:49 +0200
+
+vdrdevel-plugin-text2skin (0.0.8-2) unstable; urgency=low
+
+ * VDR 1.3.12
+ * Adapted directory structure to vdrdevel-1.3.12
+ * Adapted control file to alioth packages
+ * Using patchlevel.sh and custom control field "vdr-patchlevel"
+ * Added Makefile-fPIC-fix patch to fix potential FTBFS
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 5 Sep 2004 21:12:55 +0200
+
+vdrdevel-plugin-text2skin (0.0.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated 95_vdrdevel.dpatch to version 0.0.3
+
+ -- Thomas Günther <tom at toms-cafe.de> Thu, 15 Jul 2004 01:35:58 +0200
+
+vdrdevel-plugin-text2skin (0.0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed debhelper version in Build-Depends
+ * Added debian/watch file for uscan
+ * Removed debian/dirs
+ * Updated 95_vdrdevel.dpatch to version 0.0.2
+ * Fixed rules: make clean without .dependencies
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 27 Jun 2004 19:31:33 +0200
+
+vdrdevel-plugin-text2skin (0.0.6-2) unstable; urgency=low
+
+ * VDR 1.3.11
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 20 Jun 2004 02:48:10 +0200
+
+vdrdevel-plugin-text2skin (0.0.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed 01_Makefile.dpatch (already fixed in upstream)
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 18 Jun 2004 19:06:24 +0200
+
+vdrdevel-plugin-text2skin (0.0.5-1) unstable; urgency=low
+
+ * Fixed names, emails, urls in control, changelog, copyright
+ * Fixed dependencies in control
+ * Added dirs
+ * Removed some unnecessary files
+ * Removed TODO from docs
+ * Removed CVS directories
+ * Use dpatch to convert from vdr to vdrdevel
+ * Added etc/vdr/plugins/text2skin to dirs
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 18 Jun 2004 02:07:41 +0200
+
+vdrdevel-plugin-text2skin (0.0.5-0) unstable; urgency=low
+
+ * Initial Release
+
+ -- Catweazle <xx at xxxx.net> Wed, 16 Jun 2004 00:58:23 +0200
Added: vdr/vdr-plugin-text2skin/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/compat 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/compat 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-text2skin/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/control 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/control 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,21 @@
+Source: vdr-plugin-text2skin
+Section: misc
+Priority: extra
+Maintainer: Thomas Günther <tom at toms-cafe.de>
+Origin: ctvdr
+Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), libmagick++-dev (>= 5.5.7) | libmagick++6-dev | libmagick++9-dev, dpatch (>= 2.0.9)
+Standards-Version: 3.7.2
+
+Package: vdr-plugin-text2skin
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Suggests: vdr-skins
+Description: Plugin to vdr that loads and views skins
+ This plugin is designed to load and interpret a set of files describing the
+ layout of the On Screen Display and to make this "Skin" available to VDR via
+ Setup -> OSD in the main menu. Of course it is possible to load more than
+ one text-based skin this way and to choose between them while running VDR. All
+ skins may be themeable (you can create your own color-theme) and translateable
+ as the author of the skin wishes.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-text2skin/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/copyright 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/copyright 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,10 @@
+This package was debianized by Catweazle <xx at xxxx.net> on
+Sun, 16 June 2004 00:11:56 +0100.
+
+It was downloaded from http://www.magoa.net/linux/index.php?view=text2skin
+Upstream Author: Sascha Volkenandt <sascha at akv-soft.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-text2skin/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/docs 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/docs 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,2 @@
+README
+README.de
Added: vdr/vdr-plugin-text2skin/trunk/debian/examples
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/examples 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/examples 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1 @@
+contrib/*
Added: vdr/vdr-plugin-text2skin/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/install 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/install 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1 @@
+libvdr-text2skin.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/00list 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/00list 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,6 @@
+01_Makefile-fPIC-fix
+
+90_APIVERSION.dpatch
+91_cvs-20051107
+92_vdr-1.3.38
+93_libfreetype6-2.2.1
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,19 @@
+#!/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.
+
+ at DPATCH@
+--- text2skin/Makefile
++++ text2skin/Makefile
+@@ -25,7 +25,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,20 @@
+#! /bin/sh -e
+## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## 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
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,75 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 91_cvs-20051107.dpatch by Sascha Volkenandt <sascha at akv-soft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.36.
+
+ at DPATCH@
+--- old/CONTRIBUTORS 2005-06-18 21:01:06.000000000 +0200
++++ cvs/CONTRIBUTORS 2005-11-07 00:38:20.000000000 +0100
+@@ -17,3 +17,6 @@
+
+ Reinhard Nissl
+ for pointing out a deadly race condition in cText2SkinDisplayMenu::SetItem
++
++Frank Enderle
++ for sending a patch to fix a crash due to uninitialized pointer
+--- old/display.c 2005-06-18 21:01:07.000000000 +0200
++++ cvs/display.c 2005-11-07 00:38:20.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: display.c,v 1.23 2005/06/05 21:39:02 lordjaxom Exp $
++ * $Id: display.c,v 1.24 2005/09/20 18:22:56 lordjaxom Exp $
+ */
+
+ #include "render.h"
+@@ -693,6 +693,7 @@
+ mMessageType(mtStatus),
+ mMessageText(""),
+ mEvent(NULL),
++ mRecording(NULL),
+ mItems(),
+ mCurrentItem((uint)-1)
+ {
+--- old/file.c 2005-01-18 01:12:58.000000000 +0100
++++ cvs/file.c 2005-11-07 00:38:20.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: file.c,v 1.1.1.1 2004/12/19 22:03:13 lordjaxom Exp $
++ * $Id: file.c,v 1.2 2005/11/06 15:58:30 lordjaxom Exp $
+ */
+
+ #include "file.h"
+@@ -19,9 +19,10 @@
+ FILE *f = fopen(Filename.c_str(), "r");
+ if (f) {
+ int line = 0;
+- char buffer[MAXPARSEBUFFER];
++ char *buffer = NULL;
++ size_t buflen = 0;
+ result = true;
+- while (fgets(buffer, sizeof(buffer), f) > 0) {
++ while (getline(&buffer, &buflen, f) != -1) {
+ line++;
+ char *ptr = skipspace(stripspace(buffer));
+ if (!isempty(ptr) && ptr[0] != '#') {
+@@ -32,6 +33,7 @@
+ }
+ }
+ }
++ free(buffer);
+ fclose(f);
+ } else {
+ LOG_ERROR_STR(Filename.c_str());
+--- old/HISTORY 2005-06-18 21:01:06.000000000 +0200
++++ cvs/HISTORY 2005-11-07 00:38:20.000000000 +0100
+@@ -3,6 +3,8 @@
+
+ 2005-06-xx: Version 1.1
+
++- fixed crash due to uninitialized pointer (thanks to Frank Enderle)
++- patch for PresentRemaining by Björn (VDR-Portal)
+ - fixed a race condition (thanks to Reinhard Nissl for pointing this out)
+ - updated finnish translations (thanks to Rolf Ahrenberg)
+ - added tokens for Recording Info Display
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,77 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## vdr-1.3.38 patch - Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix signature of Recording() and Replaying() from status.h to
+## DP: be compatible with vdr > 1.3.38.
+
+ at DPATCH@
+--- vdr-plugin-text2skin-1.0+cvs20050618.orig/status.c
++++ vdr-plugin-text2skin-1.0+cvs20050618/status.c
+@@ -29,15 +29,27 @@
+ mNextRecording = 0;
+ }
+
++#if VDRVERSNUM >= 10338
++void cText2SkinStatus::Replaying(const cControl *Control, const char *Name, const char *FileName, bool On) {
++#else
+ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name) {
++#endif
+ Dprintf("cText2SkinStatus::Replaying(%s)\n", Name);
+ eReplayMode oldMode = mReplayMode;
+
+ if (mRender != NULL)
+ mRender->UpdateLock();
+
++#if VDRVERSNUM >= 10338
++ if (On) {
++#else
+ if (Name != NULL) {
++#endif
+ mReplayMode = replayMPlayer;
++#if VDRVERSNUM >= 10338
++ if (Name)
++ {
++#endif
+ if (strlen(Name) > 6 && Name[0]=='[' && Name[3]==']' && Name[5]=='(') {
+ int i;
+ for (i = 6; Name[i]; ++i) {
+@@ -70,6 +82,9 @@
+ mReplayMode = replayDVD;
+ }
+ }
++#if VDRVERSNUM >= 10338
++ }
++#endif
+ } else {
+ mReplayMode = replayNone;
+ mReplayIsLoop = false;
+@@ -83,7 +98,11 @@
+ }
+ }
+
++#if VDRVERSNUM >= 10338
++void cText2SkinStatus::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
++#else
+ void cText2SkinStatus::Recording(const cDevice *Device, const char *Name)
++#endif
+ {
+ if (mRender != NULL)
+ mRender->UpdateLock();
+--- vdr-plugin-text2skin-1.0+cvs20050618.orig/status.h
++++ vdr-plugin-text2skin-1.0+cvs20050618/status.h
+@@ -39,8 +39,13 @@
+ int mLastLanguage;
+
+ protected:
++#if VDRVERSNUM >= 10338
++ virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
++ virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
++#else
+ virtual void Replaying(const cControl *Control, const char *Name);
+ virtual void Recording(const cDevice *Device, const char *Name);
++#endif
+ virtual void OsdClear(void);
+
+ public:
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,38 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 93_libfreetype6-2.2.1.dpatch by Jerome <jlacvdr at jlac.dyndns.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix font problems with libfreetype6 >= 2.2.1
+
+ at DPATCH@
+--- text2skin-1.0-orig/graphtft/font.c 2005-01-30 19:09:42.000000000 +0100
++++ text2skin/graphtft/font.c 2006-06-30 21:33:53.000000000 +0200
+@@ -139,20 +139,21 @@
+ error = FT_Load_Glyph( _face, glyph_index, FT_LOAD_DEFAULT );
+ if ( error ) continue; /* ignore errors */
+
+- // convert to a mono bitmap
+- error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono );
+- if ( error ) continue;
+-
+ // now, convert to vdr font data
+ int width = (_slot->metrics.horiAdvance / 64) + 1;
+ int bearingX = (_slot->metrics.horiBearingX / 64) +1;
+ width = (width > (int)sizeof(cFont::tPixelData) * 8) ? (((int)sizeof(cFont::tPixelData) * 8)-2) :width ;
+- int top = _slot->bitmap_top;
+- int y_off = Size - top;
+
+ font_data[(num_char_array*num_rows)+0]=width;
+ font_data[(num_char_array*num_rows)+1]=num_rows_global;
+
++ // convert to a mono bitmap
++ error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono );
++ if ( error ) continue;
++
++ int top = _slot->bitmap_top;
++ int y_off = Size - top;
++
+ unsigned char *bmp = _slot->bitmap.buffer;
+
+ for (int y = 0; y < _slot->bitmap.rows; ++y , y_off++) {
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/rules 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/rules 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,97 @@
+#!/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
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+
+# 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=/usr/include/$(VDR) LIBDIR=.
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ 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
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(VDR)-dev/dependencies.sh
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-text2skin/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-text2skin/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/watch 2007-01-07 00:31:39 UTC (rev 3778)
+++ vdr/vdr-plugin-text2skin/trunk/debian/watch 2007-01-07 00:31:48 UTC (rev 3779)
@@ -0,0 +1,2 @@
+version=2
+http://www.magoa.net/linux/index.php?view=text2skin .*/vdr-text2skin-(.*)\.tgz
More information about the pkg-vdr-dvb-changes
mailing list