kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-dolphin
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley
Status: Merged
Merged at revision: d1ceaeb5c9144841cbe44ffa5ea79ea7cf638c89
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-dolphin:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/dolphin:kubuntu_unstable
Diff against target: 31 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
debian/dolphin.install (+1/-1)
Reviewer Review Type Date Requested Status
Rik Mills Approve
Review via email: mp+300938@code.launchpad.net

Description of the change

This fixes the path for the org.kde.dolphin.appdata.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.
Revision history for this message
Rik Mills (rikmills) wrote :

Approve

review: Approve

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 9c38b74..9fb0548 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -18,6 +18,9 @@ dolphin (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
6 * Removing missing file from libdolphinvcs-dev.install
7 * New upstream release (16.04.3)
8
9+ [ Simon Quigley ]
10+ * Fix the path for org.kde.dolphin.appdata.xml in the install file
11+
12 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 00:43:53 +0100
13
14 dolphin (4:15.12.3-0ubuntu1) xenial; urgency=medium
15diff --git a/debian/dolphin.install b/debian/dolphin.install
16index ea4006d..8205964 100644
17--- a/debian/dolphin.install
18+++ b/debian/dolphin.install
19@@ -9,7 +9,6 @@ usr/lib/*/qt5/plugins/kcm_dolphingeneral.so
20 usr/lib/*/qt5/plugins/kcm_dolphinnavigation.so
21 usr/lib/*/qt5/plugins/kcm_dolphinservices.so
22 usr/lib/*/qt5/plugins/kcm_dolphinviewmodes.so
23-usr/share/appdata/org.kde.dolphin.appdata.xml
24 usr/share/applications/org.kde.dolphin.desktop
25 usr/share/config.kcfg/
26 usr/share/dbus-1/services/org.kde.dolphin.FileManager1.service
27@@ -17,3 +16,4 @@ usr/share/doc/
28 usr/share/kservices5/
29 usr/share/kservicetypes5/
30 usr/share/kxmlgui5/
31+usr/share/metainfo

Subscribers

People subscribed via source and target branches