[SCM] kate packaging branch, kubuntu_unstable, updated. debian/4.14.2-2-24-gb153a7c

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b153a7c72f995b72cd1dd6d4a0d2164c1837519e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 15:50:19 2014 +0100

    kate-data now kate5-data for co-installability
---
 debian/changelog                                 | 1 +
 debian/control                                   | 6 ++++--
 debian/kate.install                              | 1 -
 debian/{kate-data.install => kate5-data.install} | 0
 debian/kwrite.install                            | 1 -
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39b7625..fc895b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kate (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Update build-deps and use pkg-kde v3 for Qt 5 build
+  * kate-data now kate5-data for co-installability
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 16:49:41 +0100
 
diff --git a/debian/control b/debian/control
index f125de3..b76fda7 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kate.git
 Package: kate
 Section: editors
 Architecture: any
-Depends: kate-data (>= ${source:Version}),
+Depends: kate5-data (>= ${source:Version}),
          ktexteditor-katepart,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -61,9 +61,11 @@ Description: powerful text editor
   * Symbol viewers for C, C++, and Python
   * XML completion and validation
 
-Package: kate-data
+Package: kate5-data
 Architecture: all
 Depends: ${misc:Depends}
+Replaces: kate-data (<< 4.14.3-0ubuntu4)
+Breaks: kate-data (<< 4.14.3-0ubuntu4)
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
  for Kate editor
diff --git a/debian/kate.install b/debian/kate.install
index c39f87c..b638a64 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -17,7 +17,6 @@ usr/lib/*/qt5/plugins/ktexteditor/katesymbolviewerplugin.so
 usr/lib/*/qt5/plugins/ktexteditor/katexmltoolsplugin.so
 usr/lib/*/qt5/plugins/ktexteditor/tabswitcherplugin.so
 usr/lib/*/qt5/plugins/plasma/dataengine/plasma_engine_katesessions.so
-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
diff --git a/debian/kate-data.install b/debian/kate5-data.install
similarity index 100%
rename from debian/kate-data.install
rename to debian/kate5-data.install
diff --git a/debian/kwrite.install b/debian/kwrite.install
index f45bf9e..d8f75dd 100644
--- a/debian/kwrite.install
+++ b/debian/kwrite.install
@@ -1,6 +1,5 @@
 usr/bin/kwrite
 usr/lib/*/libkdeinit5_kwrite.so
-usr/share/appdata/org.kde.kwrite.appdata.xml
 usr/share/applications/org.kde.kwrite.desktop
 usr/share/doc/HTML/*/kwrite/
 usr/share/kxmlgui5/kwrite/kwriteui.rc

-- 
kate packaging