[SCM] kolf packaging branch, master, updated. debian/16.04.0-1-7-gadefdcb

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kolf.git;a=commitdiff;h=39d1297

The following commit has been merged in the master branch:
commit 39d12977d2430957b619fb3f2bd584212281dd9a
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 31 17:55:44 2017 +0100

    simplify local install
---
 debian/changelog     |  4 ++++
 debian/kolf.install  | 11 -----------
 debian/not-installed |  1 -
 debian/rules         |  4 +++-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf207bc..add3971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ kolf (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Remove Fathi Boudra from Uploaders, as requested by the MIA team.
     (Closes: #879357)
   * Switch khelpcenter4 recommend to khelpcenter.
+  * Stop forcing debian/tmp as local installation directory, installing
+    everything to the final location
+    - drop kolf.install, no more useful now
+    - drop not-installed, no more needed now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Dec 2017 17:48:44 +0100
 
diff --git a/debian/kolf.install b/debian/kolf.install
deleted file mode 100644
index 86c7dc4..0000000
--- a/debian/kolf.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/games/kolf
-usr/lib/libkolfprivate.so.4*
-usr/share/applications/kde4/kolf.desktop
-usr/share/doc/kde/HTML/en/kolf/*
-usr/share/icons/hicolor/128x128/apps/kolf.png
-usr/share/icons/hicolor/16x16/apps/kolf.png
-usr/share/icons/hicolor/22x22/apps/kolf.png
-usr/share/icons/hicolor/32x32/apps/kolf.png
-usr/share/icons/hicolor/48x48/apps/kolf.png
-usr/share/icons/hicolor/64x64/apps/kolf.png
-usr/share/kde4/apps/kolf/*
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 2f894e8..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1 +0,0 @@
-./usr/lib/libkolfprivate.so
diff --git a/debian/rules b/debian/rules
index af1bd9b..309af16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,6 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
 
 override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
+	$(overridden_command)
+	# do not ship development stuff
+	find debian/kolf -name '*.so' -type l -delete

-- 
kolf packaging