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

Proposed by Simon Quigley
Status: Merged
Merged at revision: ff8f60b154682cceece89921c0dd6e2c89761c06
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-khangman:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/khangman:kubuntu_unstable
Diff against target: 29 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
debian/khangman.install (+1/-1)
Reviewer Review Type Date Requested Status
Rik Mills Approve
Review via email: mp+300965@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) :
Revision history for this message
Rik Mills (rikmills) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 91adbdb..c102486 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -14,6 +14,9 @@ khangman (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
6 * New upstream release (16.04.2)
7 * New upstream release (16.04.3)
8
9+ [ Simon Quigley ]
10+ * Fix the path for org.kde.khangman.appdata.xml in the install file
11+
12 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 01:04:13 +0100
13
14 khangman (4:15.12.3-0ubuntu1) xenial; urgency=medium
15diff --git a/debian/khangman.install b/debian/khangman.install
16index 5e66518..70e5800 100644
17--- a/debian/khangman.install
18+++ b/debian/khangman.install
19@@ -1,9 +1,9 @@
20 etc/xdg/khangman.knsrc
21 usr/bin/khangman
22-usr/share/appdata/org.kde.khangman.appdata.xml
23 usr/share/applications/org.kde.khangman.desktop
24 usr/share/config.kcfg/khangman.kcfg
25 usr/share/doc/HTML/*/khangman/
26 usr/share/icons/*/*/apps/khangman.*
27 usr/share/icons/*/*/apps/khangman-harmattan.*
28 usr/share/khangman/
29+usr/share/metainfo

Subscribers

People subscribed via source and target branches