[vdr] 05/10: Updated patches

Tobias Grimm tiber-guest at moszumanska.debian.org
Wed Dec 27 13:02:06 UTC 2017 

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

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

commit a5bddd2bc969bf78ed2e8297dcab07333597a196
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Jun 24 18:54:41 2017 +0200

    Updated patches
---
 debian/.vdr-patches                          |  9 +++++----
 debian/patches/04_newplugin.patch            | 12 +++++-------
 debian/patches/06_default_svdrp_port_0.patch |  8 +++-----
 debian/patches/12_osdbase-maxitems.patch     | 14 ++++++--------
 debian/patches/99_ncursesw-include.patch     |  8 +++-----
 debian/patches/systemd.patch                 | 16 +++++++---------
 debian/patchinfo                             |  5 +++++
 7 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 924e974..099c4be 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,4 +1,5 @@
-04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
-06_default_svdrp_port_0.patch:98fc8d7a9f450374de5e5690ad4c98c7
-12_osdbase-maxitems.patch:c5bf663d8e89d441eb9c040403e19228
-99_ncursesw-include.patch:98a6f4705b312dc9de9775e867e95d54
+04_newplugin.patch:588683d61d591ea5dbeebb3b0633ae3a
+06_default_svdrp_port_0.patch:e75a74f487a4f07bcd1b73319203af59
+12_osdbase-maxitems.patch:401fc8efc9900a9a766730885ac456df
+99_ncursesw-include.patch:fd58fcdbff50c97b0db92b9c45c6ec43
+systemd.patch:367980e92cbcfcf556127ac9510e5efd
diff --git a/debian/patches/04_newplugin.patch b/debian/patches/04_newplugin.patch
index 9bf1e60..efd6582 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;
@@ -15,7 +13,7 @@ Index: vdr/newplugin
  
  $README = qq
  {This is a "plugin" for the Video Disk Recorder (VDR).
-@@ -172,7 +172,7 @@
+@@ -177,7 +177,7 @@
  	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
  	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
  	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
@@ -24,7 +22,7 @@ Index: vdr/newplugin
  	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
  	\@echo Distribution package created as \$(PACKAGE).tgz
  
-@@ -325,7 +325,7 @@
+@@ -330,7 +330,7 @@
  VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
  };
  
@@ -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 @@
+@@ -352,7 +352,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..6fcad41 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
+@@ -339,6 +339,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 @@
+@@ -377,6 +378,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 @@
+@@ -417,6 +419,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 @@
+@@ -451,6 +454,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>
diff --git a/debian/patches/systemd.patch b/debian/patches/systemd.patch
index ff1b425..89fd8f9 100644
--- a/debian/patches/systemd.patch
+++ b/debian/patches/systemd.patch
@@ -1,19 +1,17 @@
 Description: Use libsystemd instead of transitional libsystemd-daemon
 Author: Tobias Grimm <etobi at debian.org>
 ---
-Index: vdr/Makefile
-===================================================================
---- vdr.orig/Makefile	2015-09-21 22:07:22.568154904 +0200
-+++ vdr/Makefile	2015-10-05 21:21:49.338294885 +0200
-@@ -95,9 +95,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -104,9 +104,9 @@
  LIBS += $(shell pkg-config --libs fribidi)
  endif
  ifdef SDNOTIFY
--INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
-+INCLUDES += $(shell pkg-config --cflags libsystemd)
+-INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
++INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd || pkg-config --cflags libsystemd)
  DEFINES += -DSDNOTIFY
--LIBS += $(shell pkg-config --libs libsystemd-daemon)
-+LIBS += $(shell pkg-config --libs libsystemd)
+-LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
++LIBS += $(shell pkg-config --silence-errors --libs libsystemd || pkg-config --libs libsystemd)
  endif
  
  LIRC_DEVICE ?= /var/run/lirc/lircd
diff --git a/debian/patchinfo b/debian/patchinfo
index 1e7ae1e..fa8df83 100644
--- a/debian/patchinfo
+++ b/debian/patchinfo
@@ -23,3 +23,8 @@ Patches applied to vanilla vdr sources
 
     Use ncursesw header file
 
+systemd.patch
+    Tobias Grimm <etobi at debian.org>
+
+    Use libsystemd instead of transitional libsystemd-daemon
+

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

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