r5397 - in /vdr/vdr-plugin-text2skin/trunk/debian: changelog copyright patches/00list patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Sat Sep 1 11:27:27 UTC 2007
Author: tom-guest
Date: Sat Sep 1 11:27:27 2007
New Revision: 5397
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5397
Log:
Added 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
Added:
vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
Modified:
vdr/vdr-plugin-text2skin/trunk/debian/changelog
vdr/vdr-plugin-text2skin/trunk/debian/copyright
vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
Modified: vdr/vdr-plugin-text2skin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/changelog?rev=5397&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog Sat Sep 1 11:27:27 2007
@@ -1,3 +1,10 @@
+vdr-plugin-text2skin (1.0+cvs20050618-30) experimental; urgency=low
+
+ * Added 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
+ * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 1 Sep 2007 13:09:22 +0200
+
vdr-plugin-text2skin (1.0+cvs20050618-29) experimental; urgency=low
* Release for vdrdevel 1.5.6
Modified: vdr/vdr-plugin-text2skin/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/copyright?rev=5397&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/copyright Sat Sep 1 11:27:27 2007
@@ -1,10 +1,38 @@
-This package was debianized by Catweazle <xx at xxxx.net> on
-Sun, 16 June 2004 00:11:56 +0100.
+Upstream Homepage:
+ http://www.magoa.net/linux/index.php?view=text2skin
-It was downloaded from http://www.magoa.net/linux/index.php?view=text2skin
-Upstream Author: Sascha Volkenandt <sascha at akv-soft.de>
+Upstream Authors:
+ Sascha Volkenandt <sascha at akv-soft.de>
+
+Debian Maintainers:
+ Tobias Grimm <tg at e-tobi.net>
+ Thomas Günther <tom at toms-cafe.de>
+ Thomas Schmidt <tschmidt at debian.org>
Copyright:
+ (C) 2004 - 2005 Sascha Volkenandt
-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 .
+Copyright (Debian packaging):
+ (C) 2004 - 2007 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; version 2 dated June, 1991.
+
+ 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 St, 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 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.
Modified: vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/00list?rev=5397&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/00list Sat Sep 1 11:27:27 2007
@@ -5,3 +5,4 @@
92_vdr-1.3.38
93_libfreetype6-2.2.1
94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4
+95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1
Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch?rev=5397&op=file
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch (added)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch Sat Sep 1 11:27:27 2007
@@ -1,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch by Stone <syphyr at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.7.
+
+ at DPATCH@
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig 2007-08-13 08:54:41.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c 2007-08-13 09:17:43.000000000 -0700
+@@ -31,8 +31,13 @@
+ const cFont *res = NULL;
+ #ifdef HAVE_FREETYPE
+ char *cachename;
++#if VDRVERSNUM >= 10507
++ asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
++ if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
++#else
+ asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
+ if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
++#endif
+ res = mFontCache.GetFont(cachename);
+ else
+ esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig 2007-08-13 07:34:10.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c 2007-08-13 08:53:31.000000000 -0700
+@@ -491,7 +491,11 @@
+
+ cText2SkinI18n::~cText2SkinI18n() {
+ for (int i = 0; mPhrases[i][0]; ++i) {
++#if VDRVERSNUM >= 10507
++ for (int j = 0; j < I18nLanguages()->Size(); ++j)
++#else
+ for (int j = 0; j < I18nNumLanguages; ++j)
++#endif
+ free((void*)mPhrases[i][j]);
+ }
+ free(mPhrases);
+@@ -507,7 +511,11 @@
+ memset(&p, 0, sizeof(tI18nPhrase));
+ Text += 17;
+
++#if VDRVERSNUM >= 10507
++ for (i = 0; i < I18nLanguages()->Size(); ++i) {
++#else
+ for (i = 0; i < I18nNumLanguages; ++i) {
++#endif
+ char *langs = strdup(I18nLanguageCode(i));
+ char *ptr = langs, *ep;
+ std::string text;
+@@ -525,7 +533,11 @@
+ }
+
+ int idx = mNumPhrases++;
++#if VDRVERSNUM >= 10507
++ for (i = 0; i < I18nLanguages()->Size(); ++i)
++#else
+ for (i = 0; i < I18nNumLanguages; ++i)
++#endif
+ if (!p[i]) p[i] = "";
+ mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
+ memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
+@@ -539,7 +551,9 @@
+
+ bool cText2SkinI18n::Load(const std::string &Filename) {
+ if (cText2SkinFile::Load(Filename)) {
++#if VDRVERSNUM <= 10506
+ I18nRegister(mPhrases, mIdentity.c_str());
++#endif
+ return true;
+ }
+ return false;
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig 2007-08-13 09:54:04.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c 2007-08-13 09:57:10.000000000 -0700
+@@ -130,8 +130,13 @@
+
+ void cText2SkinStatus::OsdClear(void)
+ {
++#if VDRVERSNUM >= 10507
++ if (I18nCurrentLanguage() != mLastLanguage) {
++ mLastLanguage = I18nCurrentLanguage();
++#else
+ if (Setup.OSDLanguage != mLastLanguage) {
+ mLastLanguage = Setup.OSDLanguage;
++#endif
+ cxString::Reparse();
+ }
+
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig 2007-08-13 09:46:25.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c 2007-08-13 10:30:11.000000000 -0700
+@@ -49,7 +49,11 @@
+
+ bool cText2SkinPlugin::Start(void) {
+ RegisterI18n(Phrases);
++#if VDRVERSNUM >= 10507
++ Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
++#else
+ Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
++#endif
+ cText2SkinLoader::Start();
+ return true;
+ }
More information about the pkg-vdr-dvb-changes
mailing list