[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=00acd60

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 00acd60d44d07f63bea3cb621fdcfcd38869e6b4
Author: Philip Muskovac <yofel at gmx.net>
Date:   Tue Nov 25 20:19:56 2014 +0100

    remove another file from katepart and bump the breaks/replaces for kata-data
---
 debian/changelog        | 2 +-
 debian/control          | 4 ++--
 debian/katepart.install | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c71fa..8139cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 kate (4:4.14.3-0ubuntu2) UNRELEASED; urgency=medium
 
-  * kate-data breaks/replaces katepart << 4:4.14.3 (LP: #1395466)
+  * kate-data breaks/replaces katepart << 4:4.14.3-0ubuntu2~ (LP: #1395466)
   * Remove files from kate that conflict with kate-data
   * kate-data breaks/replaces kate << 4:14.3-0ubuntu2~
 
diff --git a/debian/control b/debian/control
index 91377d6..053eda3 100644
--- a/debian/control
+++ b/debian/control
@@ -70,10 +70,10 @@ Package: kate-data
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: kate (<< 4:4.14.3-0ubuntu2~),
-        katepart (<< 4:4.14.3),
+        katepart (<< 4:4.14.3-0ubuntu2~),
         kdelibs5-data (<< 4:4.6.90)
 Replaces: kate (<< 4:4.14.3-0ubuntu2~),
-          katepart (<< 4:4.14.3),
+          katepart (<< 4:4.14.3-0ubuntu2~),
           kdelibs5-data (<< 4:4.6.90)
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
diff --git a/debian/katepart.install b/debian/katepart.install
index f128363..389e495 100644
--- a/debian/katepart.install
+++ b/debian/katepart.install
@@ -4,7 +4,6 @@ usr/lib/kde4/ktexteditor_exporter.so
 usr/lib/kde4/ktexteditor_hlselection.so
 usr/lib/kde4/ktexteditor_iconinserter.so
 usr/lib/kde4/ktexteditor_insertfile.so
-usr/share/kde4/apps/katepart/syntax/kconfig.xml
 usr/share/kde4/services/katepart.desktop
 usr/share/kde4/services/ktexteditor_autobrace.desktop
 usr/share/kde4/services/ktexteditor_autobrace_config.desktop

-- 
kate packaging