[SCM] kleopatra packaging branch, master, updated. debian/4%17.08.3-1-5-gd7891a8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 215def83c7bc3aa4e08f86dd3b98db19f8bd65e3
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 23 11:39:24 2017 +0100

    simplify local install
---
 debian/changelog         | 4 ++++
 debian/kleopatra.install | 3 ---
 debian/rules             | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 316f3c1..87d3365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kleopatra (4:17.08.3-2) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Switch the deprecated gnupg2 dependency to gnupg.
   * Simplify watch file, and switch it to https.
+  * Stop forcing debian/tmp as local installation directory, installing
+    everything to the final location
+    - drop kleopatra.install, no more useful now
+    - make sure to not ship development symlinks
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Dec 2017 11:31:44 +0100
 
diff --git a/debian/kleopatra.install b/debian/kleopatra.install
deleted file mode 100644
index 2304f9f..0000000
--- a/debian/kleopatra.install
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/xdg/kleopatra.categories
-etc/xdg/kleopatra.renamecategories
-usr/
diff --git a/debian/rules b/debian/rules
index 85e25f2..3c3c0f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,8 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_install:
-	rm -f debian/tmp/usr/lib/*/libkleopatraclientcore.so
-	rm -f debian/tmp/usr/lib/*/libkleopatraclientgui.so
-	$(overridden_command) --destdir=debian/tmp
+	$(overridden_command)
+	find debian/kleopatra -name '*.so' -type l -delete
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
kleopatra packaging