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

[Thomas Schmidt]

Author: tschmidt
Date: 2006-08-27 10:19:31 +0000 (Sun, 27 Aug 2006)
New Revision: 3172

Removed:
   vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr:
  * New upstream release
    - Removed 01_IA64-FTBFS-fix.dpatch


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-08-27 09:47:02 UTC (rev 3171)
+++ vdr/vdr/trunk/debian/changelog	2006-08-27 10:19:31 UTC (rev 3172)
@@ -1,5 +1,12 @@
-vdr (1.4.1-1) UNRELEASED; urgency=low
+vdr (1.4.2-1) UNRELEASED; urgency=low
 
+  * New upstream release
+    - Removed 01_IA64-FTBFS-fix.dpatch
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 27 Aug 2006 12:11:19 +0200
+
+vdr (1.4.1-1) unstable; urgency=low
+
   [ Thomas Günther ]
   * Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay.dpatch version 0.9
 

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-08-27 09:47:02 UTC (rev 3171)
+++ vdr/vdr/trunk/debian/patches/00list	2006-08-27 10:19:31 UTC (rev 3172)
@@ -1,4 +1,3 @@
-01_IA64-FTBFS-fix
 02_Makefile-CFGDIR
 03_cmdsubmenu
 04_newplugin

Deleted: vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch	2006-08-27 09:47:02 UTC (rev 3171)
+++ vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch	2006-08-27 10:19:31 UTC (rev 3172)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_IA64-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS of vdr >= 1.3.38 on ia64 by using to old behaviour
-## DP: to determine the thread-id on ia64, because the gettid syscall
-## DP: is not available on ia64
-
- at DPATCH@
-diff -urNad vdr-1.3.41/thread.c /tmp/dpep.xP5Coq/vdr-1.3.41/thread.c
---- vdr-1.3.41/thread.c	2006-01-28 12:34:35.000000000 +0100
-+++ /tmp/dpep.xP5Coq/vdr-1.3.41/thread.c	2006-03-04 23:49:42.376137750 +0100
-@@ -316,12 +316,19 @@
-   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
- }
- 
-+#ifndef __ia64__
- _syscall0(pid_t, gettid)
- 
- tThreadId cThread::ThreadId(void)
- {
-   return gettid();
- }
-+#else
-+tThreadId cThread::ThreadId(void)
-+{
-+  return pthread_self();
-+}
-+#endif
- 
- void cThread::SetMainThreadId(void)
- {