[SCM] kate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-10-g20c0927

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7e1c18f2f1cc0c1a6c9bc1f2a770029a74057990
Author: Philip Muskovac <yofel at gmx.net>
Date:   Tue Nov 25 20:05:22 2014 +0100

    Remove files from kate that conflict with kate-data
    
    * Remove files from kate that conflict with kate-data
    * kate-data breaks/replaces kate << 4:14.3-0ubuntu2~
---
 debian/changelog    | 2 ++
 debian/control      | 4 ++--
 debian/kate.install | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e60245..d6c71fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kate (4:4.14.3-0ubuntu2) UNRELEASED; urgency=medium
 
   * kate-data breaks/replaces katepart << 4:4.14.3 (LP: #1395466)
+  * Remove files from kate that conflict with kate-data
+  * kate-data breaks/replaces kate << 4:14.3-0ubuntu2~
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 25 Nov 2014 19:42:45 +0100
 
diff --git a/debian/control b/debian/control
index 6587aa8..91377d6 100644
--- a/debian/control
+++ b/debian/control
@@ -69,10 +69,10 @@ Description: embeddable text editor component
 Package: kate-data
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: kate (<< 4:4.6.90),
+Breaks: kate (<< 4:4.14.3-0ubuntu2~),
         katepart (<< 4:4.14.3),
         kdelibs5-data (<< 4:4.6.90)
-Replaces: kate (<< 4:4.6.90),
+Replaces: kate (<< 4:4.14.3-0ubuntu2~),
           katepart (<< 4:4.14.3),
           kdelibs5-data (<< 4:4.6.90)
 Description: shared data files for Kate text editor
diff --git a/debian/kate.install b/debian/kate.install
index 4c1d62a..96d8c86 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -29,8 +29,6 @@ usr/lib/kde4/plasma_applet_katesession.so
 usr/lib/libkdeinit4_kate.so
 usr/lib/python2.7/dist-packages/PyKate4/kate.so
 usr/share/applications/kde4/kate.desktop
-usr/share/kde4/apps/kate/plugins/project/kateproject.example
-usr/share/kde4/apps/kate/plugins/project/ui.rc
 usr/share/kde4/services/kate_kttsd.desktop
 usr/share/kde4/services/katebacktracebrowserplugin.desktop
 usr/share/kde4/services/katebuildplugin.desktop

-- 
kate packaging