r7204 - in /vdr/vdr/trunk/debian: changelog patches/00list patches/00list.multipatch patches/18_signalhandler-fix.dpatch patches/patchtest

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Wed Jul 23 22:47:59 2008
New Revision: 7204

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7204
Log:
Added 18_signalhandler-fix.dpatch

Added:
    vdr/vdr/trunk/debian/patches/18_signalhandler-fix.dpatch
Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/patches/00list
    vdr/vdr/trunk/debian/patches/00list.multipatch
    vdr/vdr/trunk/debian/patches/patchtest

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7204&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Wed Jul 23 22:47:59 2008
@@ -1,8 +1,12 @@
 vdr (1.6.0-6) UNRELEASED; urgency=low
 
+  [ Thomas Schmidt ]
   * Fixed bashism in debian/rules (Closes: #491586)
 
- -- Thomas Schmidt <tschmidt at debian.org>  Mon, 21 Jul 2008 11:39:42 +0200
+  [ Tobias Grimm ]
+  * Added 18_signalhandler-fix.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Thu, 24 Jul 2008 00:46:15 +0200
 
 vdr (1.6.0-5) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=7204&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Wed Jul 23 22:47:59 2008
@@ -9,6 +9,7 @@
 15_dvbplayer
 16_channels.conf.terr-fix
 17_vdr-maintenance-1.6.0-1
+18_signalhandler-fix
 
 81_Make_config
 82_valgrind

Modified: vdr/vdr/trunk/debian/patches/00list.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list.multipatch?rev=7204&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list.multipatch (original)
+++ vdr/vdr/trunk/debian/patches/00list.multipatch Wed Jul 23 22:47:59 2008
@@ -9,6 +9,7 @@
 15_dvbplayer
 16_channels.conf.terr-fix
 17_vdr-maintenance-1.6.0-1
+18_signalhandler-fix
 
 81_Make_config
 82_valgrind

Added: vdr/vdr/trunk/debian/patches/18_signalhandler-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/18_signalhandler-fix.dpatch?rev=7204&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/18_signalhandler-fix.dpatch (added)
+++ vdr/vdr/trunk/debian/patches/18_signalhandler-fix.dpatch Wed Jul 23 22:47:59 2008
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_signalhandler-fix.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes a problem with calling isyslog from within the
+## DP: signal handler. As suggested by Udo Richter, this patch reverts
+## DP: changes done in a previous upstream update.
+
+ at DPATCH@
+diff -urNad vdr-1.6.0~/vdr.c vdr-1.6.0/vdr.c
+--- vdr-1.6.0~/vdr.c	2008-03-14 14:22:39.000000000 +0100
++++ vdr-1.6.0/vdr.c	2008-07-24 00:37:31.000000000 +0200
+@@ -141,7 +141,6 @@
+ 
+ static void SignalHandler(int signum)
+ {
+-  isyslog("caught signal %d", signum);
+   switch (signum) {
+     case SIGPIPE:
+          break;
+@@ -1255,6 +1254,8 @@
+         PluginManager.MainThreadHook();
+         }
+ 
++  if (LastSignal)
++     isyslog("caught signal %d", LastSignal);
+   if (ShutdownHandler.EmergencyExitRequested())
+      esyslog("emergency exit requested - shutting down");
+ 

Modified: vdr/vdr/trunk/debian/patches/patchtest
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/patchtest?rev=7204&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/patchtest (original)
+++ vdr/vdr/trunk/debian/patches/patchtest Wed Jul 23 22:47:59 2008
@@ -14,7 +14,7 @@
     15_dvbplayer \
     16_channels.conf.terr-fix \
     17_vdr-maintenance-1.6.0-1 \
-    81_Make_config \
+    18_signalhandler-fix \
     82_valgrind \
     99_ncursesw-include"
 multipatch="$standard \