kubuntu-packaging

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

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

Description of the change

This fixes the path for the org.kde.kiriki.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
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 5f83a25..b24c379 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -14,6 +14,9 @@ kiriki (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.kiriki.appdata.xml in the install file
11+
12 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 01:06:40 +0100
13
14 kiriki (4:15.12.3-0ubuntu1) xenial; urgency=medium
15diff --git a/debian/kiriki.install b/debian/kiriki.install
16index 823d7f2..d2a84af 100644
17--- a/debian/kiriki.install
18+++ b/debian/kiriki.install
19@@ -1,9 +1,7 @@
20 ../icons/kiriki-16.xpm /usr/share/pixmaps
21 ../icons/kiriki.xpm /usr/share/pixmaps
22 usr/games/kiriki
23-usr/share/appdata/org.kde.kiriki.appdata.xml
24 usr/share/applications/org.kde.kiriki.desktop
25-usr/share/appdata/org.kde.kiriki.appdata.xml
26 usr/share/doc/HTML/en/kiriki/
27 usr/share/icons/hicolor/128x128/apps/kiriki.png
28 usr/share/icons/hicolor/16x16/apps/kiriki.png
29@@ -13,3 +11,4 @@ usr/share/icons/hicolor/48x48/apps/kiriki.png
30 usr/share/icons/hicolor/64x64/apps/kiriki.png
31 usr/share/kiriki/*
32 usr/share/kxmlgui5/kiriki/kirikiui.rc
33+usr/share/metainfo

Subscribers

People subscribed via source and target branches