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

Subscribers

People subscribed via source and target branches