[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.6-2-5-ge24e895

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e24e89532ff2d39b0db5c87a999162df5a835a78
Author: Pino Toscano <pino at debian.org>
Date:   Sat Feb 15 16:43:14 2014 +0100

    empty_target_kwinglesutils: drop, wrong
    
    the real issue is in pkg-kde-tools, and will be fixed there
---
 debian/changelog                          |  5 ++++-
 debian/patches/empty_target_kwinglesutils | 15 ---------------
 debian/patches/series                     |  1 -
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 669ddca..302ad29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
 kde-workspace (4:4.11.6-3~) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
-  * Fix patch: empty_target_kwinglesutils
   * Import kubuntu's patch: kubuntu_no_krandr.diff
   * Import kubuntu's patch: kubuntu_kcm_display_add_kscreen.diff
   * Split kde-workspace-krandr from kde-workspace-bin, in order to let
     kscreen to take over.
 
+  [ Pino Toscano ]
+  * Drop wrong patch empty_target_kwinglesutils, as it is a pkg-kde-tools
+    issue which will be fixed there.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 14 Feb 2014 11:54:45 +0100
 
 kde-workspace (4:4.11.6-2) unstable; urgency=medium
diff --git a/debian/patches/empty_target_kwinglesutils b/debian/patches/empty_target_kwinglesutils
deleted file mode 100644
index 7431f8f..0000000
--- a/debian/patches/empty_target_kwinglesutils
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kde-workspace/kwin/libkwineffects/CMakeLists.txt
-===================================================================
---- kde-workspace.orig/kwin/libkwineffects/CMakeLists.txt	2014-02-13 11:05:01.493991852 +0100
-+++ kde-workspace/kwin/libkwineffects/CMakeLists.txt	2014-02-13 11:06:02.579350285 +0100
-@@ -73,6 +73,10 @@
-     KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
-     set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
-     set_target_properties(kwinglesutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glesutils)
-+else()
-+    add_library(kwinglesutils SHARED EXCLUDE_FROM_ALL)
-+    set_target_properties(kwinglesutils PROPERTIES VERSION 1.0.0 SOVERSION 1)
-+    set_target_properties(kwinglesutils PROPERTIES LINKER_LANGUAGE CXX)
- endif()
- if(OPENGL_FOUND)
-     KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
diff --git a/debian/patches/series b/debian/patches/series
index adfe8d3..c9dcc03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,5 @@ nlist_ftbfs_krefreebsd.diff
 hurd.diff
 add_kdefakes_for_strlcpy_and_strlcat.diff
 krunner_iceweasel_bookmarks.patch
-empty_target_kwinglesutils
 kubuntu_kcm_display_add_kscreen.diff
 kubuntu_no_krandr.diff

-- 
KDE Base Workspace module packaging