rev 15727 - in trunk/packages/kdesdk/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2009-08-21 23:00:07 +0000 (Fri, 21 Aug 2009)
New Revision: 15727

Added:
   trunk/packages/kdesdk/debian/patches/03_kmtrace_compile.diff
Modified:
   trunk/packages/kdesdk/debian/changelog
   trunk/packages/kdesdk/debian/patches/series
Log:
fix kmtrace installation for kfreebsd and hurd (bug #542749)


Modified: trunk/packages/kdesdk/debian/changelog
===================================================================
--- trunk/packages/kdesdk/debian/changelog	2009-08-21 22:25:41 UTC (rev 15726)
+++ trunk/packages/kdesdk/debian/changelog	2009-08-21 23:00:07 UTC (rev 15727)
@@ -1,3 +1,13 @@
+kdesdk (4:4.3.0-3) UNRELEASED; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Add patch 03_kmtrace_compile.diff to compile kmtrace on kFreeBSD and Hurd,
+    as they are using glibc. Patch by Petr Salinger (slightly edited by me for
+    better accomodate Hurd), thanks! (Closes: #542749)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Aug 2009 00:56:10 +0200
+
 kdesdk (4:4.3.0-2) unstable; urgency=low
 
   * Add conflicts and replaces with libcvsservice0 to cvsservice.

Added: trunk/packages/kdesdk/debian/patches/03_kmtrace_compile.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/03_kmtrace_compile.diff	                        (rev 0)
+++ trunk/packages/kdesdk/debian/patches/03_kmtrace_compile.diff	2009-08-21 23:00:07 UTC (rev 15727)
@@ -0,0 +1,18 @@
+Index: kdesdk-4.3.0/CMakeLists.txt
+===================================================================
+--- kdesdk-4.3.0.orig/CMakeLists.txt	2009-08-22 00:52:14.000000000 +0200
++++ kdesdk-4.3.0/CMakeLists.txt	2009-08-22 00:52:50.000000000 +0200
+@@ -51,11 +51,11 @@
+ macro_optional_add_subdirectory(strigi-analyzer)
+ macro_optional_add_subdirectory(kioslave)
+ 
+-if (CMAKE_SYSTEM_NAME MATCHES Linux)
++if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+   #kmtrace is highly non-portable and requires glibc
+   #TODO: replace with a check for glibc
+   macro_optional_add_subdirectory(kmtrace)
+-endif (CMAKE_SYSTEM_NAME MATCHES Linux)
++endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 
+ macro_optional_add_subdirectory(kompare)
+ macro_optional_add_subdirectory(kprofilemethod)

Modified: trunk/packages/kdesdk/debian/patches/series
===================================================================
--- trunk/packages/kdesdk/debian/patches/series	2009-08-21 22:25:41 UTC (rev 15726)
+++ trunk/packages/kdesdk/debian/patches/series	2009-08-21 23:00:07 UTC (rev 15727)
@@ -1 +1,2 @@
 02_append_kde.diff
+03_kmtrace_compile.diff