[SCM] khangman packaging branch, master, updated. debian/16.08.3-1-6-g28d9419

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/khangman.git;a=commitdiff;h=28d9419

The following commit has been merged in the master branch:
commit 28d94197f1b8037e43d465b458a28c77929f09a4
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 19 11:20:29 2017 +0100

    simplify local install
---
 debian/changelog        |  5 +++++
 debian/khangman.install |  9 ---------
 debian/not-installed    | 19 -------------------
 debian/rules            |  5 ++++-
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 944840b..3f4e2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ khangman (4:17.08.3-0r1) UNRELEASED; urgency=medium
     translations.
   * Simplify watch file, and switch it to https.
   * Bump Standards-Version to 4.1.1, no changes required.
+  * Stop forcing debian/tmp as local installation directory, installing
+    everything to the final location
+    - make sure to remove the local fonts, as it already depends on (and use)
+      the system versions
+    - drop khangman.install, and not-installed, no more useful now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Nov 2017 11:17:02 +0100
 
diff --git a/debian/khangman.install b/debian/khangman.install
deleted file mode 100644
index 9cdbdf5..0000000
--- a/debian/khangman.install
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/xdg/khangman.knsrc
-usr/bin/khangman
-usr/share/*/org.kde.khangman.appdata.xml
-usr/share/applications/org.kde.khangman.desktop
-usr/share/config.kcfg/khangman.kcfg
-usr/share/doc/HTML/*/khangman/
-usr/share/icons/*/*/apps/khangman.*
-usr/share/khangman/
-usr/share/locale/
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 66e57b5..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,19 +0,0 @@
-# Shipped in fonts-dustin
-./usr/share/khangman/fonts/Domestic_Manners.ttf
-./usr/share/khangman/fonts/Dustismo_Roman.ttf
-
-# Manpages are compressed
-./usr/share/man/man6/khangman.6
-./usr/share/man/*/man6/khangman.6
-
-# New dev stuff
-./usr/include/khangman/khangman_engine_export.h
-./usr/include/khangman/khangmanengine.h
-./usr/include/khangman/prefs.h
-./usr/lib/x86_64-linux-gnu/libkhangmanengine.so
-./usr/lib/i386-linux-gnu/libkhangmanengine.so
-
-# khangman-harmattan (qml version) not built, off upstream
-# https://bugs.kde.org/show_bug.cgi?id=344834
-./usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png
-./usr/share/icons/hicolor/scalable/apps/khangman-harmattan.svgz
diff --git a/debian/rules b/debian/rules
index 570ce3a..87c5126 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,7 @@ 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:
-	$(overridden_command) --destdir=debian/tmp
+	$(overridden_command)
+	# remove fonts, so it will use the system Dustismo fonts
+	# (see fonts-dustin)
+	rm -rf debian/khangman/usr/share/khangman/fonts/

-- 
khangman packaging