[SCM] KDE Development Platform Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-26-g562522b

George Kiagiadakis gkiagia-guest at alioth.debian.org
Fri Jul 30 09:05:43 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 04942d24bc48ad336ab508b7c6e9496ab507ad0e
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Jul 30 12:01:29 2010 +0300

    Add patch 01_link_to_pthreads_typo.diff to fix a typo in kdecore/CMakeLists.txt.
---
 debian/changelog                             |    2 ++
 debian/patches/01_link_to_pthreads_typo.diff |   15 +++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d8a719..ca2df1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ kde4libs (4:4.5.0-0r1) UNRELEASED; urgency=low
   * Remove libkutils4.symbols as kutils is now a dummy
     transitional library with no symbols.
   * Refresh patches.
+  * Add patch 01_link_to_pthreads_typo.diff to fix a typo
+    in kdecore/CMakeLists.txt.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jul 2010 20:01:26 +0300
 
diff --git a/debian/patches/01_link_to_pthreads_typo.diff b/debian/patches/01_link_to_pthreads_typo.diff
new file mode 100644
index 0000000..270976e
--- /dev/null
+++ b/debian/patches/01_link_to_pthreads_typo.diff
@@ -0,0 +1,15 @@
+Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
+Description: Fix typo in CMakeLists.txt to link with pthreads.
+Origin: Upstream, r1157114.
+
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
+@@ -346,7 +346,7 @@
+ 
+ if(NOT WIN32)
+     set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache.cpp)
+-    set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIB_INIT})
++    set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ else(NOT WIN32)
+     set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache_win.cpp)
+     set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} io/kdirwatch_win.cpp)
diff --git a/debian/patches/series b/debian/patches/series
index 43deb0a..b395c4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_link_to_pthreads_typo.diff
 08_add_debian_build_type.diff
 09_disable_usr_lib_install_rpath.diff
 10_make_libkdeinit4_private.diff

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list