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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1ed209db58228034fb1f7f0754404fdce3fa7287
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Mar 1 08:19:38 2016 -0800

    Rename qml install file to match package name so  files actually get installed.
---
 debian/changelog                             | 5 +++++
 debian/qml-module-org-kde-activities.install | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3b9c56..f5e4cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kactivities-kf5 (5.19.0-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Clive Johnston ]
   * Merged with Debian
   * New upstream release
   * Fixing problem in control caused by merge
@@ -8,6 +9,10 @@ kactivities-kf5 (5.19.0-1ubuntu1) UNRELEASED; urgency=medium
   * Depend on new package kactivitymanagerd
   * Fixing install file and refreshing symbols
 
+  [ Scarlett Clark ]
+  * Rename qml install file to match package name so 
+    files actually get installed.
+
  -- Clive Johnston <clivejo at aol.com>  Thu, 25 Feb 2016 22:40:03 +0000
 
 kactivities-kf5 (5.18.0-1) experimental; urgency=medium
diff --git a/debian/qml-module-org-kde-activities.install b/debian/qml-module-org-kde-activities.install
deleted file mode 100644
index 84ddafe..0000000
--- a/debian/qml-module-org-kde-activities.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/activities/

-- 
kactivities packaging