[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-12-g09768f1

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit b75ecbc26ff1f1d0b02c0a51bdab8e91c673e8a3
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Aug 12 23:21:47 2011 +0200

    Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
---
 debian/changelog                                   |    1 +
 .../plasma_desktop_shell_drop_kactivities.diff     |   15 +++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5305944..bcba6f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kdebase-workspace (4:4.7.0-0r0) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to 4:4.7.
   * Bump kdepimlibs5-dev build dependency to 4:4.7.
   * Update patches:
+    - Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
     - Remove backport_kwin_multihead_improvements.diff, applied usptream.
     - Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
     - Refreshed various patches to make them apply without offsets.
diff --git a/debian/patches/plasma_desktop_shell_drop_kactivities.diff b/debian/patches/plasma_desktop_shell_drop_kactivities.diff
new file mode 100644
index 0000000..5cffac5
--- /dev/null
+++ b/debian/patches/plasma_desktop_shell_drop_kactivities.diff
@@ -0,0 +1,15 @@
+Origin: Ubuntu packages
+Description: Don't link plasma-desktop against libkactivities as it has been
+ imported into libkworkspace. Link against libkworkspace instead.
+
+--- a/plasma/desktop/shell/CMakeLists.txt
++++ b/plasma/desktop/shell/CMakeLists.txt
+@@ -50,7 +50,7 @@ kde4_add_app_icon(plasma_SRCS "${KDE4_IN
+ 
+ kde4_add_kdeinit_executable(plasma-desktop ${plasma_SRCS})
+ 
+-target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace kactivities plasmagenericshell)
++target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell)
+ 
+ if(UNIX AND Q_WS_X11)
+     target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES})
diff --git a/debian/patches/series b/debian/patches/series
index ed64743..ade0d5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ initialize_variables_crashfix.diff
 enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
 kwin_avoid_deep_vector_copies.diff
+plasma_desktop_shell_drop_kactivities.diff

-- 
KDE Base Workspace module packaging