[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1

[etobi]

The following commit has been merged in the e-tobi branch:
commit ba489ac82033ed49c25a067aea50e827e9b17227
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 28 20:08:39 2012 +0200

    refreshed patches

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 95721ab..ded03cc 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,8 +1,8 @@
 debian/patches/12_osdbase-maxitems.patch:10ab91b6a8619bdb50d37e2de6ec50d0
 debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
-debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
+debian/patches/82_valgrind.patch:27e07a83103317b9bc90ac9b836e2c47
 debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
-debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
+debian/patches/99_ncursesw-include.patch:fa259a7a1c210dbb2fd398eef22f2bf7
 debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
 debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
 debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
diff --git a/debian/patches/82_valgrind.patch b/debian/patches/82_valgrind.patch
index 6f261d2..feee2cf 100644
--- a/debian/patches/82_valgrind.patch
+++ b/debian/patches/82_valgrind.patch
@@ -6,9 +6,9 @@ Author: Tobias Grimm <tg at e-tobi.net>
 
 Index: vdr/plugin.c
 ===================================================================
---- vdr.orig/plugin.c	2011-12-10 22:22:04.000000000 +0100
-+++ vdr/plugin.c	2011-12-11 01:49:08.000000000 +0100
-@@ -152,6 +152,10 @@
+--- vdr.orig/plugin.c	2012-03-28 19:57:04.000000000 +0200
++++ vdr/plugin.c	2012-03-28 20:07:38.000000000 +0200
+@@ -147,6 +147,10 @@
  
  // --- cDll ------------------------------------------------------------------
  
@@ -19,7 +19,7 @@ Index: vdr/plugin.c
  cDll::cDll(const char *FileName, const char *Args)
  {
    fileName = strdup(FileName);
-@@ -163,8 +167,16 @@
+@@ -158,8 +162,16 @@
  cDll::~cDll()
  {
    delete plugin;
@@ -38,9 +38,9 @@ Index: vdr/plugin.c
  }
 Index: vdr/plugin.h
 ===================================================================
---- vdr.orig/plugin.h	2011-12-10 22:22:04.000000000 +0100
-+++ vdr/plugin.h	2011-12-11 01:49:08.000000000 +0100
-@@ -68,6 +68,9 @@
+--- vdr.orig/plugin.h	2012-03-28 19:57:04.000000000 +0200
++++ vdr/plugin.h	2012-03-28 20:07:38.000000000 +0200
+@@ -66,6 +66,9 @@
    void *handle;
    cPlugin *plugin;
  public:
@@ -52,9 +52,9 @@ Index: vdr/plugin.h
    bool Load(bool Log = false);
 Index: vdr/vdr.c
 ===================================================================
---- vdr.orig/vdr.c	2011-12-11 01:48:50.000000000 +0100
-+++ vdr/vdr.c	2011-12-11 01:49:08.000000000 +0100
-@@ -228,6 +228,9 @@
+--- vdr.orig/vdr.c	2012-03-28 20:07:38.000000000 +0200
++++ vdr/vdr.c	2012-03-28 20:07:38.000000000 +0200
+@@ -225,6 +225,9 @@
        { "grab",     required_argument, NULL, 'g' },
        { "help",     no_argument,       NULL, 'h' },
        { "instance", required_argument, NULL, 'i' },
@@ -64,7 +64,7 @@ Index: vdr/vdr.c
        { "lib",      required_argument, NULL, 'L' },
        { "lirc",     optional_argument, NULL, 'l' | 0x100 },
        { "localedir",required_argument, NULL, 'l' | 0x200 },
-@@ -251,7 +254,7 @@
+@@ -247,7 +250,7 @@
      };
  
    int c;
@@ -73,7 +73,7 @@ Index: vdr/vdr.c
          switch (c) {
            case 'a': AudioCommand = optarg;
                      break;
-@@ -292,6 +295,10 @@
+@@ -288,6 +291,10 @@
                         }
                      fprintf(stderr, "vdr: invalid instance id: %s\n", optarg);
                      return 2;
@@ -84,7 +84,7 @@ Index: vdr/vdr.c
            case 'l': {
                        char *p = strchr(optarg, '.');
                        if (p)
-@@ -440,6 +447,9 @@
+@@ -433,6 +440,9 @@
                 "                           or symlinks (default: none, same as -g-)\n"
                 "  -h,       --help         print this help and exit\n"
                 "  -i ID,    --instance=ID  use ID as the id of this VDR instance (default: 0)\n"
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
index d454520..22f1884 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	2011-12-10 22:22:04.000000000 +0100
-+++ vdr/PLUGINS/src/skincurses/skincurses.c	2011-12-11 01:49:11.000000000 +0100
+--- vdr.orig/PLUGINS/src/skincurses/skincurses.c	2012-03-28 19:57:04.000000000 +0200
++++ vdr/PLUGINS/src/skincurses/skincurses.c	2012-03-28 20:07:38.000000000 +0200
 @@ -6,7 +6,7 @@
-  * $Id: skincurses.c 2.7 2011/08/21 11:04:38 kls Exp $
+  * $Id: skincurses.c 2.8 2012/03/11 14:42:52 kls Exp $
   */
  
 -#include <ncurses.h>

-- 
vdr packaging repository