Merge ~tsimonq2/kubuntu-packaging/+git/kubuntu-khangman:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/khangman:kubuntu_unstable

[Simon Quigley]

This fixes the path for the org.kde.khangman.appdata.xml file by deleting the existing entry and adding usr/share/metainfo at the bottom of the install file.

[Rik Mills (rikmills)]

Approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 91adbdb..c102486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ khangman (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release (16.04.2)
   * New upstream release (16.04.3)
 
+  [ Simon Quigley ]
+  * Fix the path for org.kde.khangman.appdata.xml in the install file
+
  -- Clive Johnston <[e-mail]>  Fri, 08 Jul 2016 01:04:13 +0100
 
 khangman (4:15.12.3-0ubuntu1) xenial; urgency=medium
diff --git a/debian/khangman.install b/debian/khangman.install
index 5e66518..70e5800 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,9 +1,9 @@
 etc/xdg/khangman.knsrc
 usr/bin/khangman
-usr/share/appdata/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/icons/*/*/apps/khangman-harmattan.*
 usr/share/khangman/
+usr/share/metainfo