[SCM] kactivities packaging branch, kubuntu_unstable, updated. ubuntu/5.18.0-0ubuntu1-13-g42ac74d

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=42ac74d

The following commit has been merged in the kubuntu_unstable branch:
commit 42ac74d579aa9459047daacd08a1ca64d7d79b84
Author: Clive Johnston <clivejo at aol.com>
Date:   Sun Feb 28 14:52:34 2016 +0000

    Removing kactivities and adding depend on new package kactivitymanagerd
---
 debian/changelog                             |  3 +++
 debian/control                               | 10 +---------
 debian/kactivities.install                   | 14 --------------
 debian/qml-module-org-kde-activities.install |  2 --
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8340da..3ab13e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kactivities-kf5 (5.19.0-1ubuntu1) UNRELEASED; urgency=medium
   * Merged with Debian
   * New upstream release
   * Fixing problem in control caused by merge
+  * Removing kactivities packages and files in it,
+    as upstream has split into new repositories
+  * Depend on new package kactivitymanagerd
 
  -- Clive Johnston <clivejo at aol.com>  Thu, 25 Feb 2016 22:40:03 +0000
 
diff --git a/debian/control b/debian/control
index 8976af2..9454c94 100644
--- a/debian/control
+++ b/debian/control
@@ -41,18 +41,10 @@ Description: development files for kactivities.
 Package: libkf5activities5
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: kactivitymanagerd, ${misc:Depends}, ${shlibs:Depends}
 Description: Library to organize the user work in separate activities.
  This library provides functionality for managing Activities.
 
-Package: kactivities
-Architecture: any
-Depends: libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkactivities-bin
-Replaces: libkactivities-bin
-Description: Runtime to organize the user work in separate activities.
- This library provides functionality for managing Activities.
-
 Package: qml-module-org-kde-extensionplugin
 Architecture: any
 Multi-arch: same
diff --git a/debian/kactivities.install b/debian/kactivities.install
deleted file mode 100644
index ad81f9c..0000000
--- a/debian/kactivities.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/bin/kactivitymanagerd
-usr/lib/*/libkactivitymanagerd_plugin.so
-usr/lib/*/qt5/plugins/kactivitymanagerd/
-usr/lib/*/qt5/plugins/kactivitymanagerd_fileitem_linking_plugin.so
-usr/lib/*/qt5/plugins/kcm_activities.so
-usr/lib/*/qt5/plugins/kio_activities.so
-usr/lib/*/qt5/qml/org/kde/activities/settings/
-usr/share/kf5/kactivitymanagerd/
-usr/share/kservices5/activities.protocol
-usr/share/kservices5/kactivitymanagerd.desktop
-usr/share/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop
-usr/share/kservices5/kcm_activities.desktop
-usr/share/kservicetypes5/kactivitymanagerd-plugin.desktop
-usr/share/locale/*/*/kactivities5.mo
diff --git a/debian/qml-module-org-kde-activities.install b/debian/qml-module-org-kde-activities.install
index ffe1ba4..d029108 100644
--- a/debian/qml-module-org-kde-activities.install
+++ b/debian/qml-module-org-kde-activities.install
@@ -1,4 +1,2 @@
 usr/lib/*/qt5/qml/org/kde/activities/libkactivitiesextensionplugin.so
 usr/lib/*/qt5/qml/org/kde/activities/qmldir
-usr/lib/*/qt5/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so
-usr/lib/*/qt5/qml/org/kde/activities/settings/qmldir

-- 
kactivities packaging