r6177 - in /vdr/vdr-plugin-text2skin/trunk/debian: ./ patches/

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Sun Feb 10 16:13:22 UTC 2008


Author: tom-guest
Date: Sun Feb 10 16:13:22 2008
New Revision: 6177

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6177
Log:
New Upstream Snapshot cvs20080122.2311, added 95_text2skin-1.1-cvs-locale.dpatch

Added:
    vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs-locale.dpatch
Removed:
    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/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/control
    vdr/vdr-plugin-text2skin/trunk/debian/copyright
    vdr/vdr-plugin-text2skin/trunk/debian/install
    vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
    vdr/vdr-plugin-text2skin/trunk/debian/rules

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=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog Sun Feb 10 16:13:22 2008
@@ -1,3 +1,24 @@
+vdr-plugin-text2skin (1.0+cvs20080122.2311-1) experimental; urgency=low
+
+  * New Upstream Snapshot
+    - Removed 91_cvs-20051107.dpatch
+    - Removed 92_vdr-1.3.38.dpatch
+  * Added 95_text2skin-1.1-cvs-locale.dpatch
+    - Removed 01_Makefile-fPIC-fix.dpatch
+    - Removed 90_APIVERSION.dpatch
+    - Removed 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch
+    - Added gettext to Build-Depends
+    - Added installation of locale files
+  * Switched Build-System to cdbs, Build-Depend on cdbs
+  * Fixed debian-rules-ignores-make-clean-error
+  * Added get-orig-source target to debian/rules to download the newest
+    cvs-snapshot
+  * Bumped Standards-Version to 3.7.3
+  * Added Homepage field to debian/control
+  * Renamed XS-Vcs-* fields to Vcs-* in debian/control
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 10 Feb 2008 14:12:39 +0100
+
 vdr-plugin-text2skin (1.0+cvs20050618-31) experimental; urgency=low
 
   * Release for vdrdevel 1.5.10

Modified: vdr/vdr-plugin-text2skin/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/control?rev=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/control (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/control Sun Feb 10 16:13:22 2008
@@ -1,13 +1,13 @@
 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.5-1), libmagick++-dev (>= 5.5.7) | libmagick++6-dev | libmagick++9-dev, dpatch
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
+Build-Depends: debhelper (>> 4.1.16), cdbs, vdr-dev (>= 1.4.5-1), libmagick++-dev (>= 5.5.7) | libmagick++6-dev | libmagick++9-dev, gettext, dpatch
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/
+Homepage: http://www.magoa.net/linux/index.php?view=text2skin
 
 Package: vdr-plugin-text2skin
 Architecture: any

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=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/copyright Sun Feb 10 16:13:22 2008
@@ -10,25 +10,25 @@
     Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
-    (C) 2004 - 2005 Sascha Volkenandt
+    (C) 2004-2005 Sascha Volkenandt
 
 Copyright (Debian packaging):
-    (C) 2004 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2004-2008 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.
+    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 St, Fifth Floor, Boston, MA 
-    02110-1301, USA.
+    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 on most Debian systems.

Modified: vdr/vdr-plugin-text2skin/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/install?rev=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/install (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/install Sun Feb 10 16:13:22 2008
@@ -1,1 +1,2 @@
 libvdr-text2skin.so.*           usr/lib/vdr/plugins/
+locale                          usr/share/

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=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/00list Sun Feb 10 16:13:22 2008
@@ -1,8 +1,3 @@
-01_Makefile-fPIC-fix
-
-90_APIVERSION.dpatch
-91_cvs-20051107
-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
+95_text2skin-1.1-cvs-locale

Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs-locale.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs-locale.dpatch?rev=6177&op=file
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs-locale.dpatch (added)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/95_text2skin-1.1-cvs-locale.dpatch Sun Feb 10 16:13:22 2008
@@ -1,0 +1,377 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95_text2skin-1.1-cvs-locale.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/text2skin-1.1-cvs-locale.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Locales for text2skin plug-in (VDR >= 1.5.7, skins + locale patch).
+## DP: Bases on cvs snapshot from 2008-01-22 22:30:00Z + 2 patches:
+## DP: - libfreetype6-2.2.1.diff by Jerome <jlacvdr at jlac.dyndns.org>
+## DP:   http://vdrportal.de/board/thread.php?postid=489175#post489175
+## DP: - text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.diff by Stone <syphyr at gmail.com>
+## DP:   http://vdrportal.de/board/thread.php?postid=621984#post621984
+## DP: The skins have to be patched, too:
+## DP: - DeepBlue (http://vdr.pfroen.de)
+## DP:   http://toms-cafe.de/vdr/download/deepblue-0.1.4-locale.diff
+## DP: - Enigma (http://home.pages.at/brougs78/vdr_enigma.htm)
+## DP:   http://toms-cafe.de/vdr/download/enigma-0.3a-locale.diff
+## DP: - enElchi (http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/)
+## DP:   http://toms-cafe.de/vdr/download/enelchi-0.7.2-locale.diff
+## DP: - to patch other skins the Makefile from these patches could be used
+## DP:   without any changes, missing translation entries should be added to
+## DP:   the *.skin file (e.g. as comments <!-- trans('Volume') -->)
+
+ at DPATCH@
+--- text2skin-1.0+cvs20080122.2311/Makefile
++++ text2skin-1.0+cvs20080122.2311/Makefile
+@@ -19,6 +19,8 @@
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
++# IMPORTANT: the presence of this macro is important for the Make.config
++# file. So it must be defined, even if it is not used here!
+ #
+ PLUGIN = text2skin
+ 
+@@ -29,28 +31,28 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
+ 
+ ### The directory environment:
+ 
+-DVBDIR = ../../../../DVB
+ VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+-### The version number of VDR (taken from VDR's "config.h"):
++### Allow user defined options to overwrite defaults:
++
++-include $(VDRDIR)/Make.config
++
++### The version number of VDR's plugin API (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' \
++                         $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+ 
+-### Allow user defined options to overwrite defaults:
+-
+--include $(VDRDIR)/Make.config
+-
+ ### The object files (add further files here):
+ 
+ OBJS = $(PLUGIN).o loader.o display.o render.o common.o bitmap.o \
+@@ -95,43 +97,67 @@
+ endif
+ endif
+ 
+-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/linux/include -I$(DVBDIR)/include -I.
++INCLUDES += -I$(VDRDIR)/include -I.
+ 
+ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
++### The main target:
++
++all: libvdr-$(PLUGIN).so i18n
++
+ ### Implicit rules:
+ 
+ %.o: %.c
+ 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+ 
+-# Dependencies:
++### Dependencies:
+ 
+-MAKEDEP = g++ -MM -MG
++MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+ 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ 
+ -include $(DEPFILE)
+ 
+-### Targets:
++### Internationalization (I18N):
++
++PODIR     = po
++LOCALEDIR = $(VDRDIR)/locale
++I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
++I18Npot   = $(PODIR)/$(PLUGIN).pot
++
++$(I18Npot): $(wildcard *.c)
++	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP \
++	         --msgid-bugs-address='<sascha at akv-soft.de>' -o $@ $^
++
++%.po: $(I18Npot)
++	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++	@touch $@
++
++$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
++	@mkdir -p $(dir $@)
++	msgfmt -c -o $@ $<
+ 
+-all: libvdr-$(PLUGIN).so
++.PHONY: i18n
++i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
++
++### Targets:
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef DEBUG
+-	strip $(LIBDIR)/$@.$(VDRVERSION)
++	strip $(LIBDIR)/$@.$(APIVERSION)
+ endif
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+ 	@mkdir $(TMPDIR)/$(ARCHIVE)
+ 	@cp -a * $(TMPDIR)/$(ARCHIVE)
+-	@ln -s $(ARCHIVE) $(TMPDIR)/$(PLUGIN)
+-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) $(PLUGIN)
+-	@-rm -rf $(TMPDIR)/$(ARCHIVE) $(TMPDIR)/$(PLUGIN)
++	@tar czf $(PACKAGE).tgz -C $(TMPDIR) \
++	     --exclude debian --exclude CVS --exclude .svn $(ARCHIVE)
++	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+ 	@echo Distribution package created as $(PACKAGE).tgz
+ 
+ clean:
+-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ SKINS SKINS.de
++	@-rm -f $(OBJS) $(DEPFILE) *.so $(I18Npot) *.tgz core* *~ SKINS SKINS.de
+--- text2skin-1.0+cvs20080122.2311/font.c
++++ text2skin-1.0+cvs20080122.2311/font.c
+@@ -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.0+cvs20080122.2311/i18n.c
++++ text2skin-1.0+cvs20080122.2311/i18n.c
+@@ -5,6 +5,7 @@
+ #include "i18n.h"
+ #include <vdr/config.h>
+ 
++#if VDRVERSNUM < 10507
+ const tI18nPhrase Phrases[] = {
+ 	/*
+   { "English",
+@@ -156,14 +157,22 @@
+   },
+ 	{ NULL }
+ };
++#endif
+ 
++#if VDRVERSNUM >= 10507
++cText2SkinI18n::cText2SkinI18n(const char *Skin) {
++	mIdentity   = std::string("vdr-"PLUGIN_NAME_I18N"-") + Skin;
++	I18nRegister(mIdentity.substr(mIdentity.find('-') + 1).c_str());
++#else
+ cText2SkinI18n::cText2SkinI18n(const char *Skin): cText2SkinFile(Skin) {
+ 	mIdentity   = (std::string)"text2skin_" + Skin;
+ 	mNumPhrases = 0;
+ 	mPhrases    = (tI18nPhrase*)malloc(sizeof(tI18nPhrase));
+ 	memset(mPhrases[mNumPhrases], 0, sizeof(tI18nPhrase));
++#endif
+ }
+ 
++#if VDRVERSNUM < 10507
+ cText2SkinI18n::~cText2SkinI18n() {
+ 	for (int i = 0; mPhrases[i][0]; ++i) {
+ 		for (int j = 0; j < I18nNumLanguages; ++j)
+@@ -219,3 +228,4 @@
+ 	}
+ 	return false;
+ }
++#endif
+--- text2skin-1.0+cvs20080122.2311/i18n.h
++++ text2skin-1.0+cvs20080122.2311/i18n.h
+@@ -9,22 +9,32 @@
+ #include "file.h"
+ #include <vdr/i18n.h>
+ 
++#if VDRVERSNUM < 10507
++#define trNOOP(s) (s)
++
+ extern const tI18nPhrase Phrases[];
+ 
+ class cText2SkinI18n: public cText2SkinFile {
++#else
++class cText2SkinI18n {
++#endif
+ private:
+ 	std::string  mIdentity;
++#if VDRVERSNUM < 10507
+ 	tI18nPhrase *mPhrases;
+ 	int          mNumPhrases;
+ 
+ protected:
+ 	virtual bool Parse(const char *Text);
++#endif
+ 
+ public:
+ 	cText2SkinI18n(const char *Skin);
++#if VDRVERSNUM < 10507
+ 	virtual ~cText2SkinI18n();
+ 
+ 	virtual bool Load(const std::string &Filename);
++#endif
+ 	std::string Translate(const std::string &Text) { return I18nTranslate(Text.c_str(), mIdentity.c_str()); }
+ };
+ 
+--- text2skin-1.0+cvs20080122.2311/loader.c
++++ text2skin-1.0+cvs20080122.2311/loader.c
+@@ -34,6 +34,9 @@
+ }
+ 
+ void cText2SkinLoader::Load(const char *Skin) {
++#if VDRVERSNUM >= 10507
++	cText2SkinI18n *translations = new cText2SkinI18n(Skin);
++#else
+ 	cText2SkinI18n *translations = NULL;
+ 	std::string transfile = SkinPath() + "/" + Skin + "/" + Skin + ".trans";
+ 	if (access(transfile.c_str(), F_OK) == 0) {
+@@ -41,6 +44,7 @@
+ 		if (!translations->Load(transfile))
+ 			DELETENULL(translations);
+ 	}
++#endif
+ 
+ 	cText2SkinTheme *theme = new cText2SkinTheme(Skin);
+ 	std::string themefile = SkinPath() + "/" + Skin + "/" + Skin + ".colors";
+--- text2skin-1.0+cvs20080122.2311/status.c
++++ text2skin-1.0+cvs20080122.2311/status.c
+@@ -109,8 +109,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.0+cvs20080122.2311/text2skin.c
++++ text2skin-1.0+cvs20080122.2311/text2skin.c
+@@ -15,7 +15,7 @@
+ 
+ const char *cText2SkinPlugin::VERSION        = "1.1-cvs";
+ const char *cText2SkinPlugin::SKINVERSION    = "1.0";
+-const char *cText2SkinPlugin::DESCRIPTION    = "Loader for text-based skins";
++const char *cText2SkinPlugin::DESCRIPTION    = trNOOP("Loader for text-based skins");
+ 
+ cText2SkinPlugin::cText2SkinPlugin(void) {
+ }
+@@ -24,8 +24,12 @@
+ }
+ 
+ bool cText2SkinPlugin::Start(void) {
++#if VDRVERSNUM < 10507
+ 	RegisterI18n(Phrases);
+ 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
++#else
++	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
++#endif
+ 	cText2SkinLoader::Start();
+ 	return true;
+ }
+--- text2skin-1.0+cvs20080122.2311/po/de_DE.po	1970-01-01 00:00:00.000000000 +0000
++++ text2skin-1.0+cvs20080122.2311/po/de_DE.po
+@@ -0,0 +1,36 @@
++# German translations for vdr-text2skin package.
++# Copyright (C) Sascha Volkenandt <sascha at akv-soft.de>
++# This file is distributed under the same license as the vdr-text2skin package.
++# Sascha Volkenandt <sascha at akv-soft.de>, 2004, 2005.
++#
++# $Id$
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: vdr-text2skin 1.0\n"
++"Report-Msgid-Bugs-To: <sascha at akv-soft.de>\n"
++"POT-Creation-Date: 2008-01-26 14:59+0100\n"
++"PO-Revision-Date: 2008-01-26 12:38+0100\n"
++"Last-Translator: Sascha Volkenandt <sascha at akv-soft.de>\n"
++"Language-Team:  <vdr at linuxtv.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "*** Invalid Channel ***"
++msgstr ""
++
++msgid "Skin too large or incorrectly aligned"
++msgstr "Skin zu groß oder nicht korrekt ausgerichtet"
++
++msgid "Flush image cache"
++msgstr "Bildspeicher leeren"
++
++msgid "Max. image cache size"
++msgstr "Max. Größe des Bildspeichers"
++
++msgid "Flushing image cache..."
++msgstr "Bildspeicher wird geleert..."
++
++msgid "Loader for text-based skins"
++msgstr "Lader für textbasierte Skins"
+--- text2skin-1.0+cvs20080122.2311/po/fi_FI.po	1970-01-01 00:00:00.000000000 +0000
++++ text2skin-1.0+cvs20080122.2311/po/fi_FI.po
+@@ -0,0 +1,36 @@
++# Finnish translations for vdr-text2skin package.
++# Copyright (C) Sascha Volkenandt <sascha at akv-soft.de>
++# This file is distributed under the same license as the vdr-text2skin package.
++# Rolf Ahrenberg <rahrenbe at cc.hut.fi>, 2004, 2005.
++#
++# $Id$
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: vdr-text2skin 1.0\n"
++"Report-Msgid-Bugs-To: <sascha at akv-soft.de>\n"
++"POT-Creation-Date: 2008-01-26 14:59+0100\n"
++"PO-Revision-Date: 2008-01-26 12:38+0100\n"
++"Last-Translator: Rolf Ahrenberg <rahrenbe at cc.hut.fi>\n"
++"Language-Team:  <vdr at linuxtv.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=iso-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "*** Invalid Channel ***"
++msgstr ""
++
++msgid "Skin too large or incorrectly aligned"
++msgstr "Ulkoasu on liian suuri tai väärin asemoitu"
++
++msgid "Flush image cache"
++msgstr "Tyhjennä kuvat välimuistista"
++
++msgid "Max. image cache size"
++msgstr "Välimuistin maksimikoko"
++
++msgid "Flushing image cache..."
++msgstr "Tyhjennetään välimuistia..."
++
++msgid "Loader for text-based skins"
++msgstr "Helposti muokattavat ulkoasut"

Modified: vdr/vdr-plugin-text2skin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/rules?rev=6177&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/rules (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/rules Sun Feb 10 16:13:22 2008
@@ -1,93 +1,28 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# 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
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+common-build-arch::
+	$(MAKE) all $(MAKE_OPTIONS)
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+cleanbuilddir::
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f libvdr-*.so.*
+	rm -rf locale
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) all $(MAKE_OPTIONS)
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	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
+common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/patchlevel.sh subst
 	sh /usr/share/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
+VERSION_ID = $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+cvs.*//')+cvs$(shell date --utc +%0Y%0m%0d.%0k%0M)
+get-orig-source::
+	echo Downloading $(DEB_SOURCE_PACKAGE) $(VERSION_ID) from cvs...
+	cvs -d:pserver:anoncvs at vdr-developer.org:/var/cvsroot export -D NOW -d $(DEB_SOURCE_PACKAGE)-$(VERSION_ID) text2skin
+	tar czf ../$(DEB_SOURCE_PACKAGE)_$(VERSION_ID).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+	rm -rf $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+	dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"




More information about the pkg-vdr-dvb-changes mailing list