[SCM] khangman packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-15-g92f5eb0

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 92f5eb01bef98d2fbedc927b879ed536dd5dd8c1
Merge: ff5fb8079141f9ee2e54babcab8981f92320275e 56c77b33d2277c187bda4fa043531a78b8204454
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Mar 12 10:23:19 2015 -0700

    Manual merge kubuntu_unstable.

 debian/changelog        |  1 +
 debian/control          | 27 ++++++++++++++++++++++++---
 debian/khangman.install |  5 +----
 debian/not-installed    |  1 +
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 5e4e50c,4e8aae4..62e487b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,6 +1,8 @@@
  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. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Mar 2015 10:37:25 -0700
  
diff --cc debian/not-installed
index add9581,e8c8a6a..d31ffcb
--- a/debian/not-installed
+++ b/debian/not-installed
@@@ -5,13 -5,7 +5,14 @@@
  # 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
  ./usr/share/icons/hicolor/scalable/apps/khangman-harmattan.svgz

-- 
khangman packaging