From 93078db9bb09112b44ebd82f80c6ea0662ab0801 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Wed, 23 Jun 2010 01:22:33 +0300 Subject: [PATCH] Update patches for new upstream release. - kFreeBSD_Hurd_fixes.diff - remove, merged upstream; --- debian/changelog | 4 ++++ debian/patches/kFreeBSD_Hurd_fixes.diff | 22 ---------------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/kFreeBSD_Hurd_fixes.diff diff --git a/debian/changelog b/debian/changelog index be2318468..8c25d5e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ cmake (2.8.2~rc3-1) UNRELEASED; urgency=low * debian/cmake-data.NEWS: Document the changes of the new patch, so nobody gets surprised. + [ Modestas Vainius ] + * Update patches: + - kFreeBSD_Hurd_fixes.diff - remove, merged upstream. + -- Kai Wasserbäch Thu, 03 Jun 2010 16:25:20 +0200 cmake (2.8.1-5) unstable; urgency=low diff --git a/debian/patches/kFreeBSD_Hurd_fixes.diff b/debian/patches/kFreeBSD_Hurd_fixes.diff deleted file mode 100644 index 5d169cf5d..000000000 --- a/debian/patches/kFreeBSD_Hurd_fixes.diff +++ /dev/null @@ -1,22 +0,0 @@ -Author: Modestas Vainius -Description: fixes for Debian GNU/kFreeBSD and GNU/Hurd - kFreeBSD and Hurd has the same userland as Linux. This change is necessary to - enable kwsysProcessKill() to kill child processes on kFreeBSD. The bug was - detected by CTestTestTimeout test. - . - https://buildd.debian.org/fetch.cgi?pkg=cmake;ver=2.8.1-1;arch=kfreebsd-amd64;stamp=1268849159 -Origin: vendor -Forwarded: yes - ---- a/Source/kwsys/ProcessUNIX.c -+++ b/Source/kwsys/ProcessUNIX.c -@@ -2373,7 +2373,8 @@ static pid_t kwsysProcessFork(kwsysProce - Here we define the command to call on each platform and the - corresponding parsing format string. The parsing format should - have two integers to store: the pid and then the ppid. */ --#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+ || defined(__GLIBC__) || defined(__GNU__) - # define KWSYSPE_PS_COMMAND "ps axo pid,ppid" - # define KWSYSPE_PS_FORMAT "%d %d\n" - #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \ diff --git a/debian/patches/series b/debian/patches/series index f28d9a7b4..29629183c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ hurd_platform.diff -kFreeBSD_Hurd_fixes.diff FindGTK2_pangommconfig.diff FindJNI_fix_libarch_determination.diff cpack_installed_size.diff