[vdr] 06/06: New upstream release

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdr.

commit 2962a72036a070aea23628f92ffabcc7e3fbbd97
Author: etobi <git at e-tobi.net>
Date:   Thu Feb 12 18:35:15 2015 +0100

    New upstream release
---
 debian/.vdr-patches                          |  6 +++---
 debian/abi-version                           |  2 +-
 debian/changelog                             |  4 ++--
 debian/patches/06_default_svdrp_port_0.patch |  6 +++---
 debian/patches/12_osdbase-maxitems.patch     | 12 ++++++------
 debian/patches/99_ncursesw-include.patch     |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 5ffc287..aef8670 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,4 +1,4 @@
 04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
-06_default_svdrp_port_0.patch:57814ddbe49c8dbdd22d14904de5051c
-12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
-99_ncursesw-include.patch:9312525e87bdbb7181329cf7ff6c9c0c
+06_default_svdrp_port_0.patch:98fc8d7a9f450374de5e5690ad4c98c7
+12_osdbase-maxitems.patch:c5bf663d8e89d441eb9c040403e19228
+99_ncursesw-include.patch:0a5c35a4977202dba83f6e1968cae1fc
diff --git a/debian/abi-version b/debian/abi-version
index 01f207e..19deeb8 100644
--- a/debian/abi-version
+++ b/debian/abi-version
@@ -1 +1 @@
-vdr-abi-2.1.8-debian
+vdr-abi-2.1.10-debian
diff --git a/debian/changelog b/debian/changelog
index 40e5ba9..f671650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-vdr (2.1.8) UNRELEASED; urgency=medium
+vdr (2.1.10-1) UNRELEASED; urgency=medium
 
   * New upstream release
 
- -- Tobias Grimm <etobi at debian.org>  Sat, 07 Feb 2015 11:12:43 +0100
+ -- Tobias Grimm <etobi at debian.org>  Thu, 12 Feb 2015 18:34:24 +0100
 
 vdr (2.0.6-2) unstable; urgency=medium
 
diff --git a/debian/patches/06_default_svdrp_port_0.patch b/debian/patches/06_default_svdrp_port_0.patch
index f193fc2..6d48847 100644
--- a/debian/patches/06_default_svdrp_port_0.patch
+++ b/debian/patches/06_default_svdrp_port_0.patch
@@ -5,9 +5,9 @@ Author: Thomas Schmidt <tschmidt at debian.org>
 
 Index: vdr/vdr.c
 ===================================================================
---- vdr.orig/vdr.c	2013-03-23 21:20:53.000000000 +0100
-+++ vdr/vdr.c	2013-03-23 21:20:55.000000000 +0100
-@@ -182,7 +182,7 @@
+--- 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 @@
    // 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 c25a4be..8665773 100644
--- a/debian/patches/12_osdbase-maxitems.patch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -4,9 +4,9 @@ Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
 
 Index: vdr/osdbase.c
 ===================================================================
---- vdr.orig/osdbase.c	2013-03-06 22:17:53.000000000 +0100
-+++ vdr/osdbase.c	2013-03-10 18:36:53.000000000 +0100
-@@ -325,6 +325,7 @@
+--- 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 @@
  
  void cOsdMenu::CursorUp(void)
  {
@@ -14,7 +14,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -363,6 +364,7 @@
+@@ -370,6 +371,7 @@
  
  void cOsdMenu::CursorDown(void)
  {
@@ -22,7 +22,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -403,6 +405,7 @@
+@@ -410,6 +412,7 @@
  
  void cOsdMenu::PageUp(void)
  {
@@ -30,7 +30,7 @@ Index: vdr/osdbase.c
    int oldCurrent = current;
    int oldFirst = first;
    current -= displayMenuItems;
-@@ -437,6 +440,7 @@
+@@ -444,6 +447,7 @@
  
  void cOsdMenu::PageDown(void)
  {
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
index f9e8f14..fda76d9 100644
--- a/debian/patches/99_ncursesw-include.patch
+++ b/debian/patches/99_ncursesw-include.patch
@@ -3,10 +3,10 @@ Author: Tobias Grimm <tg at e-tobi.net>
 
 Index: vdr/PLUGINS/src/skincurses/skincurses.c
 ===================================================================
---- vdr.orig/PLUGINS/src/skincurses/skincurses.c	2013-04-01 19:55:49.000000000 +0200
-+++ vdr/PLUGINS/src/skincurses/skincurses.c	2013-04-01 20:04:47.000000000 +0200
+--- vdr.orig/PLUGINS/src/skincurses/skincurses.c	2015-02-12 18:35:40.567430238 +0100
++++ vdr/PLUGINS/src/skincurses/skincurses.c	2015-02-12 18:35:40.567430238 +0100
 @@ -6,7 +6,7 @@
-  * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
+  * $Id: skincurses.c 3.2 2015/02/08 10:19:00 kls Exp $
   */
  
 -#include <ncurses.h>

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