[SCM] kactivities packaging branch, master, updated. debian/4.13.3-1-15-gc2e6349

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 29b9b13f89802606294f24ee7f147caa83f6a5b0
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 2 11:44:11 2016 +0200

    disable runtime components
    
    they are not coinstallable with the Frameworks version of
    kactivitymanagerd:
    - pass -DKACTIVITIES_LIBRARY_ONLY=ON to cmake
    - update install files
---
 debian/changelog                  |  4 ++++
 debian/libkactivities-bin.install | 22 ----------------------
 debian/rules                      |  3 +++
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2805f2b..d0837fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ kactivities (4:4.13.3-1.1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8, no changes required.
   * Point watch file to the Attic, since that's where it is the last version
     for kdelibs4 (tracked by this source).
+  * Disable the runtime components, since they are not coinstallable with the
+    Frameworks version of kactivitymanagerd:
+    - pass -DKACTIVITIES_LIBRARY_ONLY=ON to cmake
+    - update install files
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 20 Apr 2016 16:22:21 +0200
 
diff --git a/debian/libkactivities-bin.install b/debian/libkactivities-bin.install
index 3e9b3e6..47bbbda 100644
--- a/debian/libkactivities-bin.install
+++ b/debian/libkactivities-bin.install
@@ -1,26 +1,4 @@
-usr/bin/kactivitymanagerd
-usr/lib/kde4/activitymanager_plugin_activityranking.so
-usr/lib/kde4/activitymanager_plugin_globalshortcuts.so
-usr/lib/kde4/activitymanager_plugin_nepomuk.so
-usr/lib/kde4/activitymanager_plugin_slc.so
-usr/lib/kde4/activitymanager_plugin_sqlite.so
-usr/lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
 usr/lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
 usr/lib/kde4/imports/org/kde/activities/models/qmldir
-usr/lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
-usr/lib/kde4/kcm_activities.so
-usr/lib/kde4/kio_activities.so
-usr/share/kde4/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
-usr/share/kde4/services/activities.protocol
-usr/share/kde4/services/activitymanager-plugin-activityranking.desktop
-usr/share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-usr/share/kde4/services/activitymanager-plugin-nepomuk.desktop
-usr/share/kde4/services/activitymanager-plugin-slc.desktop
-usr/share/kde4/services/activitymanager-plugin-sqlite.desktop
-usr/share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
-usr/share/kde4/services/kactivitymanagerd.desktop
-usr/share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
-usr/share/kde4/services/kcm_activities.desktop
-usr/share/kde4/servicetypes/activitymanager-plugin.desktop
 usr/share/ontology/kde/kao.ontology
 usr/share/ontology/kde/kao.trig
diff --git a/debian/rules b/debian/rules
index f47f37a..39bb4b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_addsubst_allLibraries = libkactivities-dev
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
+override_dh_auto_configure:
+	$(overridden_command) -- -DKACTIVITIES_LIBRARY_ONLY=ON
+
 override_dh_shlibdeps:
 	$(overridden_command) $(foreach p,$(shell dh_listpackages | grep ^lib),-p$p) -- -xkde-runtime
 	$(overridden_command) --remaining-packages

-- 
kactivities packaging