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

[Simon Quigley]

This fixes the path for the org.kde.blinken.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/blinken.install b/debian/blinken.install
index 695258a..4f55378 100644
--- a/debian/blinken.install
+++ b/debian/blinken.install
@@ -1,9 +1,9 @@
 ../icons/blinken-16.xpm /usr/share/pixmaps
 ../icons/blinken.xpm /usr/share/pixmaps
 usr/games/blinken
-usr/share/appdata/blinken.appdata.xml
 usr/share/applications/org.kde.blinken.desktop
 usr/share/blinken/
 usr/share/config.kcfg/blinken.kcfg
 usr/share/doc/HTML/*/blinken/
 usr/share/icons/hicolor/*/apps/blinken.*
+usr/share/metainfo
diff --git a/debian/changelog b/debian/changelog
index 19644a9..f3fa9c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ blinken (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.blinken.appdata.xml in the install file
+
  -- Clive Johnston <[e-mail]>  Fri, 08 Jul 2016 00:42:32 +0100
 
 blinken (4:15.12.3-0ubuntu1) xenial; urgency=medium