[SCM] KDE Development Platform Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-38-g01491b6
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sun Aug 22 20:50:15 UTC 2010
The following commit has been merged in the kde4.5 branch:
commit 2fcb9cde0f43a3ecf84bdd9241f3497c38cdf016
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date: Sun Aug 22 17:54:27 2010 +0300
Remove patch 01_link_to_pthreads_typo.diff.
---
debian/changelog | 2 --
debian/patches/01_link_to_pthreads_typo.diff | 15 ---------------
debian/patches/series | 1 -
3 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d2f232..faf10dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,8 +35,6 @@ kde4libs (4:4.5.0+svn1166279-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.
* Add docbook-xml dependency on the kdoctools package,
as it is required for building all of kde's documentation.
diff --git a/debian/patches/01_link_to_pthreads_typo.diff b/debian/patches/01_link_to_pthreads_typo.diff
deleted file mode 100644
index 270976e..0000000
--- a/debian/patches/01_link_to_pthreads_typo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-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 b395c4c..43deb0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-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