[SCM] vdr-plugin-ffnetdev packaging repository branch, master, updated. debian/0.1.2-1-1-g7319bfe

[etobi]

The following commit has been merged in the master branch:
commit 7319bfe6f31a514658be08c6d3faf5b7de76e181
Author: etobi <git at e-tobi.net>
Date:   Sat Jun 2 23:52:30 2012 +0200

    Build-depend on vdr-dev (>= 1.7.27) (dropped I18N)

diff --git a/debian/changelog b/debian/changelog
index 4d8f013..33bc46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-ffnetdev (0.1.2-2) experimental; urgency=low
+
+  * Build-depend on vdr-dev (>= 1.7.27) (dropped I18N)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 02 Jun 2012 23:52:26 +0200
+
 vdr-plugin-ffnetdev (0.1.2-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index 92c2804..6278e0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_Makefile-fPIC-fix.patch
+vdr-1.7.27-i18n.patch
diff --git a/debian/patches/vdr-1.7.27-i18n.patch b/debian/patches/vdr-1.7.27-i18n.patch
new file mode 100644
index 0000000..a5b0181
--- /dev/null
+++ b/debian/patches/vdr-1.7.27-i18n.patch
@@ -0,0 +1,121 @@
+Index: vdr-plugin-ffnetdev/Makefile
+===================================================================
+--- vdr-plugin-ffnetdev.orig/Makefile	2012-06-02 23:52:55.000000000 +0200
++++ vdr-plugin-ffnetdev/Makefile	2012-06-02 23:52:55.000000000 +0200
+@@ -50,7 +50,7 @@
+ 
+ ### The object files (add further files here):
+ 
+-COMMONOBJS = i18n.o \
++COMMONOBJS = \
+ 	\
+ 	tools/source.o tools/select.o tools/socket.o tools/tools.o 
+ 
+Index: vdr-plugin-ffnetdev/ffnetdev.c
+===================================================================
+--- vdr-plugin-ffnetdev.orig/ffnetdev.c	2012-06-02 23:51:28.000000000 +0200
++++ vdr-plugin-ffnetdev/ffnetdev.c	2012-06-02 23:53:43.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ #include <vdr/tools.h>
+ 
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "tsworker.h"
+ #include "netosd.h"
+ #include "ffnetdev.h"
+@@ -163,9 +163,6 @@
+ bool cPluginFFNetDev::Start(void)
+ {
+   // Start any background activities the plugin shall perform.
+-  RegisterI18n(Phrases);
+-  
+-  	  
+   cOSDWorker::Init(OSDPort, this);
+   cTSWorker::Init(m_StreamDevice, TSPort, this);
+   cClientControl::Init(ControlPort, this);
+Index: vdr-plugin-ffnetdev/i18n.c
+===================================================================
+--- vdr-plugin-ffnetdev.orig/i18n.c	2012-06-02 23:51:28.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,60 +0,0 @@
+-/*
+- * i18n.c: Internationalization
+- *
+- * See the README file for copyright information and how to reach the author.
+- *
+- */
+-
+-#include "i18n.h"
+-
+-const tI18nPhrase Phrases[] = {
+-  { "Full Featured Network Device for Streaming",
+-    "Full Featured Network Device for Streaming",
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-  },
+-  { "auto set as primary device",
+-    "auto set as primary device",
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-  },
+-  { "ffnetdev is running",
+-    "ffnetdev läuft gerade",
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-    "",// TODO
+-  },
+-  { NULL }
+-  };
+Index: vdr-plugin-ffnetdev/i18n.h
+===================================================================
+--- vdr-plugin-ffnetdev.orig/i18n.h	2012-06-02 23:51:28.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,15 +0,0 @@
+-/*
+- * i18n.h: Internationalization
+- *
+- * See the README file for copyright information and how to reach the author.
+- *
+- */
+-
+-#ifndef _I18N__H
+-#define _I18N__H
+-
+-#include <vdr/i18n.h>
+-
+-extern const tI18nPhrase Phrases[];
+-
+-#endif //_I18N__H

-- 
vdr-plugin-ffnetdev packaging repository