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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-06-12 15:46:52 +0000 (Sun, 12 Jun 2005)
New Revision: 663

Added:
   vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch
Removed:
   vdr/vdr/trunk/debian/patches/10_livelock.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr: 
        - Added 18_vdr-1.3.26-pagedown-fix.dpatch
        - Deleted 10_livelock.dpatch


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-06-12 15:30:29 UTC (rev 662)
+++ vdr/vdr/trunk/debian/changelog	2005-06-12 15:46:52 UTC (rev 663)
@@ -1,7 +1,15 @@
-vdr (1.3.25-1) experimental; urgency=low
+vdr (1.3.26-1) unstable; urgency=low
 
   * (NOT RELEASED YET) New upstream release
+  
+  * Thomas Schmidt <tschmidt@debian.org>
+    - New upstream release
+      + Added 18_vdr-1.3.26-pagedown-fix.dpatch
 
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 12 Jun 2005 16:52:15 +0200
+
+vdr (1.3.25-1) experimental; urgency=low
+
   * Thomas Schmidt <tschmidt@debian.org>
     - New upstream release
       + Updated 05_set_system_time_as_user.dpatch

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-06-12 15:30:29 UTC (rev 662)
+++ vdr/vdr/trunk/debian/patches/00list	2005-06-12 15:46:52 UTC (rev 663)
@@ -7,13 +7,13 @@
 07_not_as_root
 08_security_CAN-2005-0071
 09_sort_options
-#10_livelock
 12_nptl
 13_remote
 14_update-resume
 15_dvbplayer
 16_dvbspu
 17_replay
+18_vdr-1.3.26-pagedown-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/10_livelock.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/10_livelock.dpatch	2005-06-12 15:30:29 UTC (rev 662)
+++ vdr/vdr/trunk/debian/patches/10_livelock.dpatch	2005-06-12 15:46:52 UTC (rev 663)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_livelock.dpatch by Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a livelock problem when jumping between editing marks.
-
-@DPATCH@
-diff -urNad vdr-1.3.23/dvbplayer.c /tmp/dpep.KvgOVM/vdr-1.3.23/dvbplayer.c
---- vdr-1.3.23/dvbplayer.c	2005-04-12 01:28:23.392793314 +0100
-+++ /tmp/dpep.KvgOVM/vdr-1.3.23/dvbplayer.c	2005-04-12 01:28:23.978745831 +0100
-@@ -464,6 +464,7 @@
-         cPoller Poller;
-         if (DevicePoll(Poller, 100)) {
- 
-+           sched_yield();
-            LOCK_THREAD;
- 
-            // Read the next frame from the file:

Added: vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch	2005-06-12 15:30:29 UTC (rev 662)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch	2005-06-12 15:46:52 UTC (rev 663)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_vdr-1.3.26-pagedown-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix handling of the "page down" function
+
+@DPATCH@
+diff -urNad vdr-1.3.26/osdbase.c /tmp/dpep.Devsn7/vdr-1.3.26/osdbase.c
+--- vdr-1.3.26/osdbase.c	2005-06-12 12:44:22.000000000 +0200
++++ /tmp/dpep.Devsn7/vdr-1.3.26/osdbase.c	2005-06-12 17:35:50.779644016 +0200
+@@ -362,7 +362,7 @@
+   if (current >= 0) {
+      if (current < first)
+         first = current;
+-     else if (current - first >= displayMenuItems)
++     if (current - first >= displayMenuItems || current == last)
+         first = current - displayMenuItems + 1;
+      }
+   if (current != oldCurrent || first != oldFirst) {