kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-kate
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley on 2016-07-24
Status: Merged
Merged at revision: 14c64b12ca47d11f6e77ca858d43a65959b852f1
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-kate:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kate:kubuntu_unstable
Diff against target: 50 lines (+6/-3)
4 files modified
debian/changelog (+4/-0)
debian/kate.install (+1/-1)
debian/kate5-data.install (+0/-1)
debian/kwrite.install (+1/-1)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2016-07-24 Pending
Review via email: mp+301003@code.launchpad.net

Description of the Change

This removes an obsolete rc.ui file from an install file and does the appdata -> metainfo transition.

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 3477d37..25269d9 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -14,6 +14,10 @@ kate (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
6 * New upstream release 16.04.2
7 * New upstream release (16.04.3)
8
9+ [ Simon Quigley ]
10+ * Removed the unused rc.ui file from kate5-data
11+ * Completed the usr/share/appdata -> usr/share/metainfo transition
12+
13 -- Clive Johnston <clivejo@kubuntu.org> Fri, 08 Jul 2016 00:50:16 +0100
14
15 kate (4:15.12.3-0ubuntu2) xenial; urgency=medium
16diff --git a/debian/kate.install b/debian/kate.install
17index 0a69016..60bbb48 100644
18--- a/debian/kate.install
19+++ b/debian/kate.install
20@@ -1,9 +1,9 @@
21 usr/bin/kate
22 usr/lib/*/qt5/plugins/ktexteditor/
23 usr/lib/*/qt5/plugins/plasma/dataengine/plasma_engine_katesessions.so
24-usr/share/appdata/org.kde.kate.appdata.xml
25 usr/share/applications/org.kde.kate.desktop
26 usr/share/doc/HTML/*/kate/
27 usr/share/kservices5/plasma-dataengine-katesessions.desktop
28+usr/share/metainfo/org.kde.kate.appdata.xml
29 usr/share/plasma/plasmoids/org.kde.plasma.katesessions
30 usr/share/plasma/services/org.kde.plasma.katesessions.operations
31diff --git a/debian/kate5-data.install b/debian/kate5-data.install
32index 81ac012..fe81a6a 100644
33--- a/debian/kate5-data.install
34+++ b/debian/kate5-data.install
35@@ -2,5 +2,4 @@ usr/share/doc/HTML/*/katepart/
36 usr/share/icons/hicolor/
37 usr/share/kateproject/kateproject.example
38 usr/share/katexmltools/
39-usr/share/kxmlgui5/katexmltools/ui.rc
40 usr/share/man/man1/kate.1
41diff --git a/debian/kwrite.install b/debian/kwrite.install
42index 6adec61..c0d17fb 100644
43--- a/debian/kwrite.install
44+++ b/debian/kwrite.install
45@@ -1,4 +1,4 @@
46 usr/bin/kwrite
47-usr/share/appdata/org.kde.kwrite.appdata.xml
48 usr/share/applications/org.kde.kwrite.desktop
49+usr/share/metainfo/org.kde.kwrite.appdata.xml
50 usr/share/doc/HTML/*/kwrite/

Subscribers

People subscribed via source and target branches