[SCM] kate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-42-gbd4168e

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kate.git;a=commitdiff;h=bd4168e

The following commit has been merged in the kubuntu_vivid_archive branch:
commit bd4168e2dfe1fccb15ec75119b83e34d4f4d1bcf
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Mar 9 21:03:13 2015 +0100

    Don't install applet file, broken in 14.12
---
 debian/changelog     | 6 +++++-
 debian/kate.install  | 1 -
 debian/not-installed | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 678f976..636cb8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 kate (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Mar 2015 10:14:10 -0700
+  [ Jonathan Riddell ]
+  * Don't install applet file, broken in 14.12
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 09 Mar 2015 20:54:11 +0100
 
 kate (4:14.12.2-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/kate.install b/debian/kate.install
index c39f87c..c56b7b9 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -21,7 +21,6 @@ usr/share/appdata/org.kde.kate.appdata.xml
 usr/share/applications/org.kde.kate.desktop
 usr/share/doc/HTML/*/kate/
 usr/share/kservices5/katesymbolviewerplugin.desktop
-usr/share/kservices5/plasma-applet-org.kde.plasma.katesessions.desktop
 usr/share/kservices5/plasma-dataengine-katesessions.desktop
 usr/share/plasma/plasmoids/org.kde.plasma.katesessions
 usr/share/plasma/services/org.kde.plasma.katesessions.operations
diff --git a/debian/not-installed b/debian/not-installed
index c26dbb1..01fe6e4 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -4,3 +4,6 @@
 
 # compressed manpage
 ./usr/share/man/man1/kate.1
+
+#broken in applications 15.04
+./usr/share/kservices5/plasma-applet-org.kde.plasma.katesessions.desktop

-- 
kate packaging