[SCM] libkcompactdisc packaging branch, kde4.11, updated. debian/4.10.5-1-3-g27ed644

[Maximiliano Curia]

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

The following commit has been merged in the kde4.11 branch:
commit af18aedf6b8bb1b2189bed4c504393ac32124c83
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Sep 24 10:06:36 2013 +0000

    Remove patch upstream_disable-wmlib-on-GNU-Hurd.patch, applied by upstream.
---
 debian/changelog                                   |    2 ++
 debian/patches/series                              |    1 -
 .../upstream_disable-wmlib-on-GNU-Hurd.patch       |   32 --------------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68349ff..7186c0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libkcompactdisc (4:4.11.1-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove patch upstream_disable-wmlib-on-GNU-Hurd.patch, applied by
+    upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:17:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index ca55a6e..41e9cd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream_disable-wmlib-on-GNU-Hurd.patch
 kfreebsd_include.diff
diff --git a/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch b/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch
deleted file mode 100644
index 1e99265..0000000
--- a/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4d7f2c572dec110ea71eae95f203e057cb4e41e3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Mon, 8 Apr 2013 18:45:35 +0200
-Subject: [PATCH] disable wmlib on GNU/Hurd
-
-there is no implementation for it, yet
----
- CMakeLists.txt |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 59aeaa5..57004fa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,11 +44,11 @@ set(wmlib_SRCS
-         wmlib/drv_toshiba.c
- )
- 
--if (APPLE OR WIN32)
-+if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 	set(USE_WMLIB false)
--else (APPLE OR WIN32)
-+else (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 	set(USE_WMLIB true)
--endif (APPLE OR WIN32)
-+endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 
- set(kcompactdisc_LIB_SRCS kcompactdisc.cpp kcompactdisc_p.cpp phonon_interface.cpp)
- 
--- 
-1.7.10.4
-

-- 
libkcompactdisc packaging