kubuntu-packaging

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

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

Description of the Change

This fixes the path for the org.kde.ark.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.
Clive Johnston (clivejo) wrote :

Thank you for the patch, merged into kubuntu_unstable

Rik Mills (rikmills) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/ark.install b/debian/ark.install
2index 39d4391..375008c 100644
3--- a/debian/ark.install
4+++ b/debian/ark.install
5@@ -3,7 +3,6 @@ usr/bin/ark
6 usr/lib/*/libkerfuffle.so.16
7 usr/lib/*/libkerfuffle.so.16.*
8 usr/lib/*/qt5/plugins/*
9-usr/share/appdata/org.kde.ark.appdata.xml
10 usr/share/applications/org.kde.ark.desktop
11 usr/share/config.kcfg/ark.kcfg
12 usr/share/doc/HTML/*/ark/*
13@@ -12,3 +11,4 @@ usr/share/kservices5/*
14 usr/share/kservicetypes5/*
15 usr/share/kxmlgui5/ark/*
16 usr/share/man/man1/ark.1
17+usr/share/metainfo
18diff --git a/debian/changelog b/debian/changelog
19index 5c03f87..daf7374 100644
20--- a/debian/changelog
21+++ b/debian/changelog
22@@ -25,6 +25,9 @@ ark (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
23 * Fixing install file
24 * New upstream release (16.04.3)
25
26+ [ Simon Quigley ]
27+ * Fix the path for org.kde.ark.appdata.xml in the install file
28+
29 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 00:41:29 +0100
30
31 ark (4:15.12.3-0ubuntu1) xenial; urgency=medium

Subscribers

People subscribed via source and target branches