[SCM] kate packaging branch, master, updated. debian/4.13.1-1-4-g8386006

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1c28eb1e86675d8066c925752ad8485988bb6833
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 31 15:43:07 2014 +0200

    do not really install go.xml
    
    it is already provided by kate-syntax-go (see #628161)
---
 debian/changelog         | 2 ++
 debian/kate-data.install | 1 -
 debian/rules             | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0921d2..47e5c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kate (4:4.13.1-2) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Disable pate, since it introduces a build-dependency loop (see also
     https://bugs.debian.org/729215#10).
+  * Do not really install (even if renamed) the go.xml syntax file, since
+    it is already provided by kate-syntax-go (see #628161).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 May 2014 15:18:33 +0200
 
diff --git a/debian/kate-data.install b/debian/kate-data.install
index 524b225..94f64a4 100644
--- a/debian/kate-data.install
+++ b/debian/kate-data.install
@@ -151,7 +151,6 @@ usr/share/kde4/apps/katepart/syntax/glosstex.xml
 usr/share/kde4/apps/katepart/syntax/glsl.xml
 usr/share/kde4/apps/katepart/syntax/gnuassembler.xml
 usr/share/kde4/apps/katepart/syntax/gnuplot.xml
-usr/share/kde4/apps/katepart/syntax/go-lang.xml
 usr/share/kde4/apps/katepart/syntax/grammar.xml
 usr/share/kde4/apps/katepart/syntax/haml.xml
 usr/share/kde4/apps/katepart/syntax/haskell.xml
diff --git a/debian/rules b/debian/rules
index 7099631..d2f029d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,4 @@ override_dh_strip:
 	$(overridden_command) --dbg-package=kate-dbg
 
 override_dh_install:
-	mv debian/tmp/usr/share/kde4/apps/katepart/syntax/go.xml \
-	   debian/tmp/usr/share/kde4/apps/katepart/syntax/go-lang.xml
 	$(overridden_command)

-- 
kate packaging