kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-sdk
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley on 2016-07-22
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 2016-07-22 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
1diff --git a/debian/changelog b/debian/changelog
2index 095027e..2b890eb 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,9 +1,13 @@
6 plasma-sdk (4: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+ * Fix the path for org.kde.cuttlefish.appdata.xml in the install file
15+
16 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:07:42 +0100
17
18 plasma-sdk (4:5.6.5-0ubuntu1) yakkety; urgency=medium
19diff --git a/debian/plasma-sdk.install b/debian/plasma-sdk.install
20index 01c0627..2f8a401 100644
21--- a/debian/plasma-sdk.install
22+++ b/debian/plasma-sdk.install
23@@ -3,7 +3,6 @@ usr/bin/plasmaengineexplorer
24 usr/bin/plasmathemeexplorer
25 usr/bin/plasmoidviewer
26 usr/lib/*/qt5/plugins/ktexteditor/cuttlefishplugin.so
27-usr/share/appdata/org.kde.cuttlefish.appdata.xml
28 usr/share/applications/org.kde.cuttlefish.desktop
29 usr/share/applications/org.kde.plasma.themeexplorer.desktop
30 usr/share/kpackage/genericqml/org.kde.plasma.themeexplorer/
31@@ -19,5 +18,6 @@ usr/share/locale/*/*/plasmate.mo
32 usr/share/locale/*/*/plasmawallpaperviewer.mo
33 usr/share/locale/*/*/plasmoidviewer.mo
34 usr/share/locale/*/*/remote-widgets-browser.mo
35+usr/share/metainfo
36 usr/share/plasma/packages/org.kde.plasma.cuttlefish/
37 usr/share/plasma/shells/org.kde.plasma.plasmoidviewershell/

Subscribers

People subscribed via source and target branches