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

Proposed by Simon Quigley
Status: Merged
Merged at revision: 7c03788b3760d8f75d1d50f9a6faa7a60330d319
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-sdk:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/plasma-sdk:kubuntu_unstable
Diff against target: 37 lines (+5/-1)
2 files modified
debian/changelog (+4/-0)
debian/plasma-sdk.install (+1/-1)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+300950@code.launchpad.net

Description of the change

This fixes the path for the org.kde.ark.cuttlefish.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
diff --git a/debian/changelog b/debian/changelog
index 095027e..2b890eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
1plasma-sdk (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium1plasma-sdk (4: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 * Fix the path for org.kde.cuttlefish.appdata.xml in the install file
10
7 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:07:42 +010011 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:07:42 +0100
812
9plasma-sdk (4:5.6.5-0ubuntu1) yakkety; urgency=medium13plasma-sdk (4:5.6.5-0ubuntu1) yakkety; urgency=medium
diff --git a/debian/plasma-sdk.install b/debian/plasma-sdk.install
index 01c0627..2f8a401 100644
--- a/debian/plasma-sdk.install
+++ b/debian/plasma-sdk.install
@@ -3,7 +3,6 @@ usr/bin/plasmaengineexplorer
3usr/bin/plasmathemeexplorer3usr/bin/plasmathemeexplorer
4usr/bin/plasmoidviewer4usr/bin/plasmoidviewer
5usr/lib/*/qt5/plugins/ktexteditor/cuttlefishplugin.so5usr/lib/*/qt5/plugins/ktexteditor/cuttlefishplugin.so
6usr/share/appdata/org.kde.cuttlefish.appdata.xml
7usr/share/applications/org.kde.cuttlefish.desktop6usr/share/applications/org.kde.cuttlefish.desktop
8usr/share/applications/org.kde.plasma.themeexplorer.desktop7usr/share/applications/org.kde.plasma.themeexplorer.desktop
9usr/share/kpackage/genericqml/org.kde.plasma.themeexplorer/8usr/share/kpackage/genericqml/org.kde.plasma.themeexplorer/
@@ -19,5 +18,6 @@ usr/share/locale/*/*/plasmate.mo
19usr/share/locale/*/*/plasmawallpaperviewer.mo18usr/share/locale/*/*/plasmawallpaperviewer.mo
20usr/share/locale/*/*/plasmoidviewer.mo19usr/share/locale/*/*/plasmoidviewer.mo
21usr/share/locale/*/*/remote-widgets-browser.mo20usr/share/locale/*/*/remote-widgets-browser.mo
21usr/share/metainfo
22usr/share/plasma/packages/org.kde.plasma.cuttlefish/22usr/share/plasma/packages/org.kde.plasma.cuttlefish/
23usr/share/plasma/shells/org.kde.plasma.plasmoidviewershell/23usr/share/plasma/shells/org.kde.plasma.plasmoidviewershell/

Subscribers

People subscribed via source and target branches