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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-06-19 15:34:09 +0000 (Sun, 19 Jun 2005)
New Revision: 671

Removed:
   vdr/vdr/trunk/debian/patches/12_nptl.dpatch
   vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr:
    - New upstream release (1.3.27)
      + Removed 12_nptl.dpatch
      + Removed 18_vdr-1.3.26-pagedown-fix.dpatch


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-06-19 15:25:47 UTC (rev 670)
+++ vdr/vdr/trunk/debian/changelog	2005-06-19 15:34:09 UTC (rev 671)
@@ -1,9 +1,18 @@
-vdr (1.3.26-1) unstable; urgency=low
+vdr (1.3.27-1) unstable; urgency=low
 
   * (NOT RELEASED YET) New upstream release
   
   * Thomas Schmidt <tschmidt@debian.org>
     - New upstream release
+      + Removed 12_nptl.dpatch
+      + Removed 18_vdr-1.3.26-pagedown-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 19 Jun 2005 17:25:56 +0200
+
+vdr (1.3.26-1) unstable; urgency=low
+
+  * 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

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-06-19 15:25:47 UTC (rev 670)
+++ vdr/vdr/trunk/debian/patches/00list	2005-06-19 15:34:09 UTC (rev 671)
@@ -7,13 +7,11 @@
 07_not_as_root
 08_security_CAN-2005-0071
 09_sort_options
-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/12_nptl.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/12_nptl.dpatch	2005-06-19 15:25:47 UTC (rev 670)
+++ vdr/vdr/trunk/debian/patches/12_nptl.dpatch	2005-06-19 15:34:09 UTC (rev 671)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_nptl.dpatch by  <ds@flibble.youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad vdr-1.3.16/vdr.c /tmp/dpep.AffX44/vdr-1.3.16/vdr.c
---- vdr-1.3.16/vdr.c	2004-11-14 20:05:59.000000000 +0000
-+++ /tmp/dpep.AffX44/vdr-1.3.16/vdr.c	2004-11-14 20:08:18.000000000 +0000
-@@ -92,8 +92,7 @@
-   char LibPthreadVersion[128];
-   if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
-      if (strstr(LibPthreadVersion, "NPTL")) {
--        fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
--        return 2;
-+        fprintf(stderr, "vdr: warning: NPTL is active - there may be problems\n");
-         }
-      }
- #endif

Deleted: 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-19 15:25:47 UTC (rev 670)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.26-pagedown-fix.dpatch	2005-06-19 15:34:09 UTC (rev 671)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_vdr-1.3.26-pagedown-fix.dpatch by Udo Richter <udo_richter@gmx.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.Vp2fkN/vdr-1.3.26/osdbase.c
---- vdr-1.3.26/osdbase.c	2005-06-12 12:44:22.000000000 +0200
-+++ /tmp/dpep.Vp2fkN/vdr-1.3.26/osdbase.c	2005-06-18 16:39:23.488592296 +0200
-@@ -350,6 +350,10 @@
-   current += displayMenuItems;
-   first += displayMenuItems;
-   int last = Count() - 1;
-+  if (first + displayMenuItems > last) {
-+     first = last - displayMenuItems + 1;
-+     if (first < 0) first = 0;
-+     }
-   int tmpCurrent = current;
-   while (!SelectableItem(tmpCurrent) && ++tmpCurrent <= last)
-         ;