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

Proposed by Simon Quigley
Status: Merged
Merged at revision: 09f1694ae3b774623dd9afcac8035c9ccfbf8767
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-discover:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/discover:kubuntu_unstable
Diff against target: 33 lines (+6/-1)
2 files modified
debian/changelog (+5/-0)
debian/plasma-discover.install (+1/-1)
Reviewer Review Type Date Requested Status
Rik Mills Pending
Review via email: mp+300984@code.launchpad.net

Description of the change

This adds the path for the metainfo directory in the install file for plasma-discover and removes the obsolete appdata directory.

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

Approved

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 98bb667..3329bb3 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,9 +1,14 @@
6 plasma-discover (5.7.2-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Clive Johnston ]
9 * New upstream release (5.7.1)
10 * Merged with Debian
11 * New upstream release (5.7.2)
12
13+ [ Simon Quigley ]
14+ * Add the path for the metainfo directory in the install file
15+ for plasma-discover and remove obsolete appdata directory
16+
17 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:06:12 +0100
18
19 plasma-discover (5.7.1-1) unstable; urgency=medium
20diff --git a/debian/plasma-discover.install b/debian/plasma-discover.install
21index 27ebe88..8f4e6a0 100644
22--- a/debian/plasma-discover.install
23+++ b/debian/plasma-discover.install
24@@ -5,8 +5,8 @@ usr/lib/*/qt5/plugins/discover/
25 usr/lib/*/qt5/qml/org/kde/discover/
26 usr/lib/*/qt5/qml/org/kde/discovernotifier/libDiscoverNotifierDeclarativePlugin.so
27 usr/lib/*/qt5/qml/org/kde/discovernotifier/qmldir
28-usr/share/appdata/*
29 usr/share/applications/*
30 usr/share/knotifications5/*
31 usr/share/kservices5/*
32+usr/share/metainfo
33 usr/share/plasma/plasmoids/*

Subscribers

People subscribed via source and target branches