r1870 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Thu Jan 26 20:03:32 UTC 2006
Author: tschmidt
Date: 2006-01-26 20:03:31 +0000 (Thu, 26 Jan 2006)
New Revision: 1870
Removed:
vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch
vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch
vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
Log:
vdr: New upstream release 1.3.40
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2006-01-26 19:54:33 UTC (rev 1869)
+++ vdr/vdr/trunk/debian/changelog 2006-01-26 20:03:31 UTC (rev 1870)
@@ -1,3 +1,15 @@
+vdr (1.3.40-1) unstable; urgency=low
+
+ * NOT RELEASED YET
+
+ * 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
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 26 Jan 2006 20:51:50 +0100
+
vdr (1.3.39-1) unstable; urgency=low
* Thomas Schmidt <tschmidt at debian.org>
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2006-01-26 19:54:33 UTC (rev 1869)
+++ vdr/vdr/trunk/debian/patches/00list 2006-01-26 20:03:31 UTC (rev 1870)
@@ -10,9 +10,6 @@
15_dvbplayer
17_replay
18_vdr-1.3.39-menu-on-control
-19_vdr-1.3.39-clre-crash-fix
-20_vdr-1.3.39-schedule-crash-fix
-21_vdr-1.3.39-keys-fix
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
# opt-21_subtitles_and_ttxtsubs
Deleted: vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch 2006-01-26 19:54:33 UTC (rev 1869)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch 2006-01-26 20:03:31 UTC (rev 1870)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 19_vdr-1.3.39-clre-crash-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes segfault of vdr when using the CLRE command via SVDRP
-
- at DPATCH@
-diff -urNad vdr-1.3.39/epg.c /tmp/dpep.91NkxL/vdr-1.3.39/epg.c
---- vdr-1.3.39/epg.c 2006-01-15 14:58:30.000000000 +0100
-+++ /tmp/dpep.91NkxL/vdr-1.3.39/epg.c 2006-01-20 22:16:32.753728500 +0100
-@@ -935,7 +935,8 @@
- cSchedulesLock SchedulesLock(true, 1000);
- cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
- if (s) {
-- s->Clear();
-+ for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
-+ Schedule->Cleanup(INT_MAX);
- return true;
- }
- return false;
Deleted: vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch 2006-01-26 19:54:33 UTC (rev 1869)
+++ vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch 2006-01-26 20:03:31 UTC (rev 1870)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 20_vdr-1.3.39-schedule-crash-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes crash of vdr when epg contains 'NULL' in titles
-
- at DPATCH@
-diff -urNad vdr-1.3.39/epg.c /tmp/dpep.4wv6zh/vdr-1.3.39/epg.c
---- vdr-1.3.39/epg.c 2006-01-15 14:58:30.000000000 +0100
-+++ /tmp/dpep.4wv6zh/vdr-1.3.39/epg.c 2006-01-20 22:23:29.323762500 +0100
-@@ -421,13 +421,18 @@
- strreplace(shortText, '\x87', ' ');
- strreplace(description, '\x86', ' ');
- strreplace(description, '\x87', ' ');
--
-+
-+ if (!title) {
-+ // we don't want any "(null)" titles
-+ title = strcpyrealloc(title, tr("No title"));
-+ EpgBugFixStat(12, ChannelID());
-+ }
-+
- if (Setup.EPGBugfixLevel == 0)
- return;
-
- // Some TV stations apparently have their own idea about how to fill in the
- // EPG data. Let's fix their bugs as good as we can:
-- if (title) {
-
- // Some channels put the ShortText in quotes and use either the ShortText
- // or the Description field, depending on how long the string is:
-@@ -609,12 +614,6 @@
- }
- }
- }
-- else {
-- // we don't want any "(null)" titles
-- title = strcpyrealloc(title, tr("No title"));
-- EpgBugFixStat(12, ChannelID());
-- }
--}
-
- // --- cSchedule -------------------------------------------------------------
-
Deleted: vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch 2006-01-26 19:54:33 UTC (rev 1869)
+++ vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch 2006-01-26 20:03:31 UTC (rev 1870)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 21_vdr-1.3.39-keys-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes cKeyMacros to be kNone-safe
-
- at DPATCH@
-diff -urNad vdr-1.3.39/keys.c /tmp/dpep.C9NYym/vdr-1.3.39/keys.c
---- vdr-1.3.39/keys.c 2006-01-05 16:39:26.000000000 +0100
-+++ /tmp/dpep.C9NYym/vdr-1.3.39/keys.c 2006-01-20 22:10:03.133378750 +0100
-@@ -250,9 +250,11 @@
-
- const cKeyMacro *cKeyMacros::Get(eKeys Key)
- {
-- for (cKeyMacro *k = First(); k; k = Next(k)) {
-- if (*k->Macro() == Key)
-- return k;
-- }
-+ if (Key != kNone) {
-+ for (cKeyMacro *k = First(); k; k = Next(k)) {
-+ if (*k->Macro() == Key)
-+ return k;
-+ }
-+ }
- return NULL;
- }
-diff -urNad vdr-1.3.39/vdr.c /tmp/dpep.C9NYym/vdr-1.3.39/vdr.c
---- vdr-1.3.39/vdr.c 2006-01-15 14:31:57.000000000 +0100
-+++ /tmp/dpep.C9NYym/vdr-1.3.39/vdr.c 2006-01-20 22:10:03.133378750 +0100
-@@ -985,7 +985,7 @@
- }
- else {
- // Key functions in "normal" viewing mode:
-- if (KeyMacros.Get(key)) {
-+ if (key != kNone && KeyMacros.Get(key)) {
- cRemote::PutMacro(key);
- key = kNone;
- }
More information about the pkg-vdr-dvb-changes
mailing list