[SCM] Konversation packaging for Debian branch, master, updated. debian/1.5-2-10-g2efa544

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=commitdiff;h=5f04d14

The following commit has been merged in the master branch:
commit 5f04d14a569ef684405dd175f071586cc3141a73
Author: Diane Trout <diane at ghic.org>
Date:   Fri Aug 28 11:08:17 2015 -0700

    Update install files for new Plasma5 locations.
---
 debian/changelog                 | 1 +
 debian/konversation-data.install | 8 +++++---
 debian/konversation.install      | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70cc969..35d6453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ konversation (1.6-1) UNRELEASED; urgency=medium
   * Remove cve-2014-8483.patch, applied upstream.
   * New upstream release.
   * Update Build-Depends to KF5 packages.
+  * Update install files for new Plasma5 locations.
 
  -- Diane Trout <diane at debian.org>  Thu, 27 Aug 2015 22:17:59 -0700
 
diff --git a/debian/konversation-data.install b/debian/konversation-data.install
index 8e1ea06..8aaa147 100644
--- a/debian/konversation-data.install
+++ b/debian/konversation-data.install
@@ -1,5 +1,7 @@
-usr/share/doc/kde*
+usr/share/doc/HTML/*
 usr/share/icons/hicolor/*
-usr/share/kde4/apps/kconf_update/konversation*
-usr/share/kde4/apps/konversation/*
+usr/share/kconf_update/konversation*
+usr/share/konversation/*
+usr/share/kxmlgui5/konversation/konversationui.rc
+usr/share/knotifications5/konversation.notifyrc
 usr/share/locale/*
diff --git a/debian/konversation.install b/debian/konversation.install
index 2d3f360..c059526 100644
--- a/debian/konversation.install
+++ b/debian/konversation.install
@@ -1,6 +1,6 @@
 debian/*.xpm usr/share/pixmaps
 usr/bin/konversation
-usr/share/applications/kde4/konversation.desktop
-usr/share/kde4/services/konvirc.protocol
-usr/share/kde4/services/konvirc6.protocol
-usr/share/kde4/services/konvircs.protocol
+usr/share/applications/org.kde.konversation.desktop
+usr/share/kservices5/konvirc.protocol
+usr/share/kservices5/konvirc6.protocol
+usr/share/kservices5/konvircs.protocol

-- 
Konversation packaging for Debian