[SCM] libkcompactdisc packaging branch, master, updated. debian/4.10.2-3-2-g939e9b5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkcompactdisc.git;a=commitdiff;h=939e9b5

The following commit has been merged in the master branch:
commit 939e9b5ceacf3f19f275b93663a0f8d77f8074f2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon May 27 22:26:22 2013 +0200

    Remove upstream_cmake-link-to-pthread-when-wmlib-is-used.patch, applied by upstream.
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 -
 ..._cmake-link-to-pthread-when-wmlib-is-used.patch |   27 --------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63af4bf..5315d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libkcompactdisc (4:4.10.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove upstream_cmake-link-to-pthread-when-wmlib-is-used.patch, applied by
+    upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 25 May 2013 21:48:12 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 0dc21d0..ca55a6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
 upstream_disable-wmlib-on-GNU-Hurd.patch
 kfreebsd_include.diff
diff --git a/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch b/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
deleted file mode 100644
index 7d76d82..0000000
--- a/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 943938c09e2fe44e5a20804be8ba18e72bc6d730 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Tue, 9 Apr 2013 12:02:26 +0200
-Subject: [PATCH] cmake: link to pthread when wmlib is used
-
-wmlib explicitly uses pthread, so make sure to link to it without relying on something else
----
- CMakeLists.txt |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 59aeaa5..1ab8721 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,6 +63,9 @@ target_link_libraries(kcompactdisc ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} ${KD
- if (HAVE_LIBASOUND2)
-     target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
- endif (HAVE_LIBASOUND2)
-+if (USE_WMLIB)
-+    target_link_libraries(kcompactdisc ${CMAKE_THREAD_LIBS_INIT})
-+endif (USE_WMLIB)
- 
- set_target_properties(kcompactdisc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- 
--- 
-1.7.10.4
-

-- 
libkcompactdisc packaging