[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=8386006

The following commit has been merged in the master branch:
commit 838600672056f97a4012a064b77a47ef6cca09f5
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 31 15:49:20 2014 +0200

    manually clean debian/tmp from stuff which must not be installed
    
    let's avoid to accidentally install them back...
---
 debian/changelog     |  2 ++
 debian/not-installed | 17 -----------------
 debian/rules         |  9 ++++++++-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47e5c67..63187a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kate (4:4.13.1-2) UNRELEASED; urgency=medium
     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).
+  * Remove the files we must not install for real, so this should help not
+    installing them accidentally again.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 May 2014 15:18:33 +0200
 
diff --git a/debian/not-installed b/debian/not-installed
index 47da019..c26dbb1 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -4,20 +4,3 @@
 
 # compressed manpage
 ./usr/share/man/man1/kate.1
-
-# provided by kate-syntax-go -- #628161
-./usr/share/kde4/apps/katepart/syntax/go.xml
-
-# provided by nescc -- #716942
-./usr/share/kde4/apps/katepart/syntax/nesc.xml
-
-# these would belong to kate-dev
-./usr/include/kate/application.h
-./usr/include/kate/documentmanager.h
-./usr/include/kate/mainwindow.h
-./usr/include/kate/plugin.h
-./usr/include/kate/pluginconfigpageinterface.h
-./usr/include/kate/pluginmanager.h
-./usr/include/kate_export.h
-./usr/lib/libkateinterfaces.so
-./usr/lib/libkatepartinterfaces.so
diff --git a/debian/rules b/debian/rules
index d2f029d..368f7b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,12 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 override_dh_strip:
 	$(overridden_command) --dbg-package=kate-dbg
 
-override_dh_install:
+override_dh_auto_install:
 	$(overridden_command)
+	# provided by kate-syntax-go -- #628161
+	rm -f debian/tmp/usr/share/kde4/apps/katepart/syntax/go.xml
+	# provided by nescc -- #716942
+	rm -f debian/tmp/usr/share/kde4/apps/katepart/syntax/nesc.xml
+	# these would belong to kate-dev
+	rm -rf debian/tmp/usr/include
+	find debian/tmp/usr/lib -maxdepth 1 -name '*.so' -type l -delete

-- 
kate packaging