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

Proposed by Simon Quigley on 2016-07-22
Status: Merged
Merged at revision: 5ce194f000198f8eeb00b68005b734ede7d0ab21
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-kiten:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kiten:kubuntu_unstable
Diff against target: 31 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
debian/kiten.install (+1/-1)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2016-07-22 Pending
Review via email: mp+300966@code.launchpad.net

Description of the Change

This fixes the path for the kiten.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.

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 62b4053..e6c9acc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -15,6 +15,9 @@ kiten (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 kiten.appdata.xml in the install file
11+
12 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 01:07:45 +0100
13
14 kiten (4:15.12.3-0ubuntu1) xenial; urgency=medium
15diff --git a/debian/kiten.install b/debian/kiten.install
16index 7952da4..9ff1aef 100644
17--- a/debian/kiten.install
18+++ b/debian/kiten.install
19@@ -3,7 +3,6 @@ usr/bin/kiten
20 usr/bin/kitengen
21 usr/bin/kitenkanjibrowser
22 usr/bin/kitenradselect
23-usr/share/appdata/kiten.appdata.xml
24 usr/share/applications/org.kde.kiten*.desktop
25 usr/share/config.kcfg/kiten.kcfg
26 usr/share/doc/HTML/en/kiten/
27@@ -13,3 +12,4 @@ usr/share/kiten
28 usr/share/kxmlgui5/kiten/kitenui.rc
29 usr/share/kxmlgui5/kitenkanjibrowser/kanjibrowserui.rc
30 usr/share/kxmlgui5/kitenradselect/radselectui.rc
31+usr/share/metainfo

Subscribers

People subscribed via source and target branches