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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Feb 13 10:06:41 UTC 2014


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

The following commit has been merged in the master branch:
commit 84b97e2d822ab37458e8e1cbe92d2767ca9b30a0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Feb 13 09:58:49 2014 +0100

    Fix patch: empty_target_kwinglesutils
---
 debian/changelog                          | 6 ++++++
 debian/patches/empty_target_kwinglesutils | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9127326..33f3596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kde-workspace (4:4.11.6-3) UNRELEASED; urgency=medium
+
+  * Fix patch: empty_target_kwinglesutils
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Feb 2014 09:58:42 +0100
+
 kde-workspace (4:4.11.6-2) unstable; urgency=medium
 
   * Update symbols files.
diff --git a/debian/patches/empty_target_kwinglesutils b/debian/patches/empty_target_kwinglesutils
index 51a85b1..7431f8f 100644
--- a/debian/patches/empty_target_kwinglesutils
+++ b/debian/patches/empty_target_kwinglesutils
@@ -1,14 +1,14 @@
 Index: kde-workspace/kwin/libkwineffects/CMakeLists.txt
 ===================================================================
---- kde-workspace.orig/kwin/libkwineffects/CMakeLists.txt	2014-01-26 20:57:46.919256130 +0100
-+++ kde-workspace/kwin/libkwineffects/CMakeLists.txt	2014-02-12 20:05:05.923466835 +0100
+--- 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()
-+    kde4_add_library(kwinglesutils SHARED)
-+    set_target_properties(kwinglesutils PROPERTIES VERSION 1.0.0 SONAME 1)
++    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)

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list