[vdr] 08/16: Refreshed patches

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.3.2-1_etobi1
in repository vdr.

commit 6851885d3aad6565c2aca14f83d977ef7f81065b
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Jan 7 13:18:55 2017 +0100

    Refreshed patches
---
 debian/patches/04_newplugin.patch            |  8 +++-----
 debian/patches/06_default_svdrp_port_0.patch |  8 +++-----
 debian/patches/12_osdbase-maxitems.patch     | 14 ++++++--------
 debian/patches/99_ncursesw-include.patch     |  8 +++-----
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/debian/patches/04_newplugin.patch b/debian/patches/04_newplugin.patch
index 9bf1e60..d277f45 100644
--- a/debian/patches/04_newplugin.patch
+++ b/debian/patches/04_newplugin.patch
@@ -2,10 +2,8 @@ Description: Patch for the newplugin-script, to not require a normal
  vdr-source-dir
 Author: Thomas Schmidt <tschmidt at debian.org>
 
-Index: vdr/newplugin
-===================================================================
---- vdr.orig/newplugin	2013-03-06 22:17:53.000000000 +0100
-+++ vdr/newplugin	2013-03-10 18:36:53.000000000 +0100
+--- a/newplugin
++++ b/newplugin
 @@ -24,7 +24,7 @@
  $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
  $PLUGIN_MAINENTRY = $PLUGIN_CLASS;
@@ -33,7 +31,7 @@ Index: vdr/newplugin
  
  die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
  die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
-@@ -346,7 +346,8 @@
+@@ -347,7 +347,8 @@
  * fill in the code skeleton in "$PLUGIN_NAME.c" to implement your plugin function
  * add further source files if necessary
  * adapt the "Makefile" if necessary
diff --git a/debian/patches/06_default_svdrp_port_0.patch b/debian/patches/06_default_svdrp_port_0.patch
index 6d48847..03a40d4 100644
--- a/debian/patches/06_default_svdrp_port_0.patch
+++ b/debian/patches/06_default_svdrp_port_0.patch
@@ -3,11 +3,9 @@ Description: This sets the default svdrp-port to 0, which means that
  another port with the --port option when starting vdr
 Author: Thomas Schmidt <tschmidt at debian.org>
 
-Index: vdr/vdr.c
-===================================================================
---- vdr.orig/vdr.c	2015-02-12 18:35:32.103236816 +0100
-+++ vdr/vdr.c	2015-02-12 18:35:32.103236816 +0100
-@@ -187,7 +187,7 @@
+--- a/vdr.c
++++ b/vdr.c
+@@ -191,7 +191,7 @@
    // Command line options:
  
  #define dd(a, b) (*a ? a : b)
diff --git a/debian/patches/12_osdbase-maxitems.patch b/debian/patches/12_osdbase-maxitems.patch
index 8665773..e5b176b 100644
--- a/debian/patches/12_osdbase-maxitems.patch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -2,11 +2,9 @@ Description: Fixes problems with text2skin skin enigma.
 Author: Andreas Brugger <brougs78 at gmx.net>
 Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
 
-Index: vdr/osdbase.c
-===================================================================
---- vdr.orig/osdbase.c	2015-02-12 18:35:37.923369859 +0100
-+++ vdr/osdbase.c	2015-02-12 18:35:37.919369768 +0100
-@@ -332,6 +332,7 @@
+--- a/osdbase.c
++++ b/osdbase.c
+@@ -334,6 +334,7 @@
  
  void cOsdMenu::CursorUp(void)
  {
@@ -14,7 +12,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -370,6 +371,7 @@
+@@ -372,6 +373,7 @@
  
  void cOsdMenu::CursorDown(void)
  {
@@ -22,7 +20,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -410,6 +412,7 @@
+@@ -412,6 +414,7 @@
  
  void cOsdMenu::PageUp(void)
  {
@@ -30,7 +28,7 @@ Index: vdr/osdbase.c
    int oldCurrent = current;
    int oldFirst = first;
    current -= displayMenuItems;
-@@ -444,6 +447,7 @@
+@@ -446,6 +449,7 @@
  
  void cOsdMenu::PageDown(void)
  {
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
index 588b5db..ace0e0d 100644
--- a/debian/patches/99_ncursesw-include.patch
+++ b/debian/patches/99_ncursesw-include.patch
@@ -1,12 +1,10 @@
 Description: Use ncursesw header file
 Author: Tobias Grimm <tg at e-tobi.net>
 
-Index: vdr/PLUGINS/src/skincurses/skincurses.c
-===================================================================
---- vdr.orig/PLUGINS/src/skincurses/skincurses.c	2015-02-21 11:33:20.023435359 +0100
-+++ vdr/PLUGINS/src/skincurses/skincurses.c	2015-02-21 11:33:20.023435359 +0100
+--- a/PLUGINS/src/skincurses/skincurses.c
++++ b/PLUGINS/src/skincurses/skincurses.c
 @@ -6,7 +6,7 @@
-  * $Id: skincurses.c 3.3 2015/02/17 13:13:17 kls Exp $
+  * $Id: skincurses.c 4.2 2016/12/22 14:09:09 kls Exp $
   */
  
 -#include <ncurses.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git