r2325 - in vdr/vdr/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-04-11 18:30:44 +0000 (Tue, 11 Apr 2006)
New Revision: 2325

Added:
   vdr/vdr/trunk/debian/patches/16_vdr-1.3.46_menuitems.c-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
Added 16_vdr-1.3.46_menuitems.c-fix.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-04-10 18:03:05 UTC (rev 2324)
+++ vdr/vdr/trunk/debian/changelog	2006-04-11 18:30:44 UTC (rev 2325)
@@ -8,6 +8,7 @@
     - Removed 16_vdr_1.3.45_diseqc.conf-fix.dpatch
     - Removed 17_replay.dpatch
     - Removed 99_epg-fix.dpatch
+    - Added 16_vdr-1.3.46_menuitems.c-fix.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun,  9 Apr 2006 17:46:02 +0200
 

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-04-10 18:03:05 UTC (rev 2324)
+++ vdr/vdr/trunk/debian/patches/00list	2006-04-11 18:30:44 UTC (rev 2325)
@@ -9,6 +9,7 @@
 12_osdbase-maxitems
 14_cap-memsize
 15_dvbplayer
+16_vdr-1.3.46_menuitems.c-fix
 
 # Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
 # opt-21_subtitles_and_ttxtsubs

Added: vdr/vdr/trunk/debian/patches/16_vdr-1.3.46_menuitems.c-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/16_vdr-1.3.46_menuitems.c-fix.dpatch	2006-04-10 18:03:05 UTC (rev 2324)
+++ vdr/vdr/trunk/debian/patches/16_vdr-1.3.46_menuitems.c-fix.dpatch	2006-04-11 18:30:44 UTC (rev 2325)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_vdr-1.3.46_menuitems.c-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
+## http://article.gmane.org/gmane.linux.vdr/28702
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes set time transponder crash.
+
+ at DPATCH@
+--- vdr-1.3.46/menuitems.c 2006/04/09 13:10:02     1.36
++++ vdr-1.3.46/menuitems.c 2006/04/10 06:31:02
+@@ -572,7 +572,7 @@
+      snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
+      SetValue(buf);
+      }
+-  else
++  else if (noneString)
+      SetValue(noneString);
+ }