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

[Thomas Schmidt]

Author: tschmidt
Date: 2006-02-02 15:02:39 +0000 (Thu, 02 Feb 2006)
New Revision: 1946

Added:
   vdr/vdr/trunk/debian/patches/99_epg-fix.dpatch
Removed:
   vdr/vdr/trunk/debian/patches/13_epgfix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr: New upstream release 1.3.41

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-02-02 14:30:15 UTC (rev 1945)
+++ vdr/vdr/trunk/debian/changelog	2006-02-02 15:02:39 UTC (rev 1946)
@@ -1,9 +1,18 @@
-vdr (1.3.40-1) unstable; urgency=low
+vdr (1.3.41-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+      + Removed 13_epgfix.dpatch
+      + Added 99_epg-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu,  2 Feb 2006 14:47:30 +0100
+
+vdr (1.3.40-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
       + Removed 19_vdr-1.3.39-clre-crash-fix.dpatch
       + Removed 20_vdr-1.3.39-schedule-crash-fix.dpatch
       + Removed 21_vdr-1.3.39-keys-fix.dpatch

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-02-02 14:30:15 UTC (rev 1945)
+++ vdr/vdr/trunk/debian/patches/00list	2006-02-02 15:02:39 UTC (rev 1946)
@@ -6,7 +6,6 @@
 10_dd-record-option
 11_sortrecordings
 12_osdbase-maxitems
-13_epgfix
 15_dvbplayer
 17_replay
 18_vdr-1.3.39-menu-on-control

Deleted: vdr/vdr/trunk/debian/patches/13_epgfix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/13_epgfix.dpatch	2006-02-02 14:30:15 UTC (rev 1945)
+++ vdr/vdr/trunk/debian/patches/13_epgfix.dpatch	2006-02-02 15:02:39 UTC (rev 1946)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 13_epgfix.dpatch by clocker at vdrportal.de
-## http://www.vdrportal.de/board/thread.php?postid=246358#post246358
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Force saving EPG data on exit.
-
- at DPATCH@
---- vdr-1.3.22-orig/vdr.c	2005-02-12 16:06:16.000000000 +0100
-+++ vdr-1.3.22/vdr.c		2005-03-26 13:13:11.000000000 +0100
-@@ -929,6 +929,7 @@
- Exit:
- 
-   PluginManager.StopPlugins();
-+  cSchedules::Cleanup(true);
-   cRecordControls::Shutdown();
-   cCutter::Stop();
-   delete Menu;

Added: vdr/vdr/trunk/debian/patches/99_epg-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/99_epg-fix.dpatch	2006-02-02 14:30:15 UTC (rev 1945)
+++ vdr/vdr/trunk/debian/patches/99_epg-fix.dpatch	2006-02-02 15:02:39 UTC (rev 1946)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_epg-fix.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes small bug in event handling - probably fixed in next release
+
+ at DPATCH@
+diff -urNad vdr-1.3.41~/epg.c vdr-1.3.41/epg.c
+--- vdr-1.3.41~/epg.c	2006-01-29 15:17:33.000000000 +0100
++++ vdr-1.3.41/epg.c	2006-02-01 01:41:17.000000000 +0100
+@@ -321,7 +321,7 @@
+                              }
+                           }
+                        break;
+-             case 'e': if (!Event->Title())
++             case 'e': if (Event && !Event->Title())
+                           Event->SetTitle(tr("No title"));
+                        Event = NULL;
+                        break;


Property changes on: vdr/vdr/trunk/debian/patches/99_epg-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *