kubuntu-packaging

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

Proposed by Simon Quigley on 2016-07-22

Status:	Merged
Merged at revision:	a1a20d1432612b8a186f6943cbcdc88a91809db7
Proposed branch:	~tsimonq2/kubuntu-packaging/+git/kubuntu-klettres:kubuntu_unstable
Merge into:	~kubuntu-packagers/kubuntu-packaging/+git/klettres:kubuntu_unstable
Diff against target:	27 lines (+4/-1) 2 files modified debian/changelog (+3/-0) debian/klettres-data.install (+1/-1)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Rik Mills		2016-07-22	Approve on 2016-07-22
Review via email: mp+300957@code.launchpad.net

This fixes the path to use usr/share/metainfo instead of usr/share/appdata in the install file.

Revision history for this message

Rik Mills (rikmills) wrote on 2016-07-22:

Approved

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	diff --git a/debian/changelog b/debian/changelog
2	index e674f59..80dc7ab 100644
3	--- a/debian/changelog
4	+++ b/debian/changelog
5	@@ -14,6 +14,9 @@ klettres (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 from appdata to metainfo in the install file
11	+
12	-- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 01:08:56 +0100
13
14	klettres (4:15.12.3-0ubuntu1) xenial; urgency=medium
15	diff --git a/debian/klettres-data.install b/debian/klettres-data.install
16	index c93913c..74925d9 100644
17	--- a/debian/klettres-data.install
18	+++ b/debian/klettres-data.install
19	@@ -1,7 +1,7 @@
20	etc/xdg/*
21	-usr/share/appdata/*
22	usr/share/config.kcfg/*
23	usr/share/doc/*
24	usr/share/icons/*
25	usr/share/klettres/*
26	usr/share/kxmlgui5/*
27	+usr/share/metainfo