[SCM] khangman packaging branch, kubuntu_unstable, updated. debian/4.14.1-1-17-g713c20b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 713c20bdd0aeba82b89d1b51abf775b92d305c94
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Mar 12 19:52:09 2015 +0100

    revert back to pre-merge version
---
 debian/changelog        | 3 ---
 debian/khangman.install | 5 +----
 debian/not-installed    | 7 -------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index decea78..4e8aae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,6 @@
 khangman (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
-  * Remove wildcard from not-installed and hard code path. 
-  * Manual merge kubuntu_unstable. 
-  * Merge of course broke my build.. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Mar 2015 10:37:25 -0700
 
diff --git a/debian/khangman.install b/debian/khangman.install
index 5a28908..7990c34 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,6 +1,5 @@
 etc/
 usr/bin/khangman
-usr/lib/*/libkhangmanengine.so.*
 usr/share/appdata/khangman.appdata.xml
 usr/share/applications/org.kde.khangman.desktop
 usr/share/config.kcfg/khangman.kcfg
@@ -12,7 +11,5 @@ usr/share/icons/hicolor/48x48/apps/khangman.png
 usr/share/icons/hicolor/64x64/apps/khangman.png
 usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png
 usr/share/icons/hicolor/scalable/apps/khangman.svgz
-usr/share/khangman/pics
-usr/share/khangman/sounds
+usr/share/khangman/qml
 usr/share/khangman/themes
-usr/share/kxmlgui5/khangman/khangmanui.rc
diff --git a/debian/not-installed b/debian/not-installed
index d31ffcb..e8c8a6a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -5,13 +5,6 @@
 # Manpages are compressed
 ./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

-- 
khangman packaging