kubuntu-packaging

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

  1. Git
  2. lp:~wxl/kubuntu-packaging/+git/plasma-sdk
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by ԜаӀtеr Ⅼарсһуnѕkі
Status: Merged
Merged at revision: c3f2f9faa8d86a60583ed09bf7f41e5d752784eb
Proposed branch: ~wxl/kubuntu-packaging/+git/plasma-sdk:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/plasma-sdk:kubuntu_unstable
Diff against target: 36 lines (+8/-3)
2 files modified
debian/changelog (+5/-2)
debian/plasma-sdk.lintian-overrides (+3/-1)
Reviewer Review Type Date Requested Status
Simon Quigley Approve
Review via email: mp+311880@code.launchpad.net

Description of the change

Resolved spelling and formatting errors in changelog and added plasmate.desktop to lintian-overrides.

I followed the example of cuttlefish.desktop, which oddly lacks the interpreter directive plasmate.desktop has upstream, so perhaps it should be removed from lintian-overrides, but probably isn't going to hurt anything.

Fixes http://kci.pangea.pub/job/zesty_unstable_plasma-sdk/28/parsed_console/

To post a comment you must log in.
Revision history for this message
Clive Johnston (clivejo) wrote :

You should also add a changelog entry to explain what you have done

Revision history for this message
Simon Quigley (tsimonq2) wrote :

👍

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 05488d6..d634b87 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -4,15 +4,18 @@ plasma-sdk (4:5.8.3-0ubuntu1) UNRELEASED; urgency=medium
6 * Update Vcs-Git fields to use https:// instead of git://
7
8 [ Rik Mills ]
9- * Update dependancy names
10+ * Update dependency names
11
12 [ Simon Quigley ]
13 * New upstream release (5.8.3)
14- [ José Manuel Santamaría Lema ]
15+
16 [ José Manuel Santamaría Lema ]
17 * Merge with debian, dropping the -dbg package and the *.install file
18 in the process
19
20+ [ Walter Lapchynski ]
21+ * Added plasmate.desktop to lintian-overrides
22+
23 -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 29 Oct 2016 16:48:40 +0200
24
25 plasma-sdk (4:5.7.5-0ubuntu2) yakkety; urgency=medium
26diff --git a/debian/plasma-sdk.lintian-overrides b/debian/plasma-sdk.lintian-overrides
27index b30fb58..96ff166 100644
28--- a/debian/plasma-sdk.lintian-overrides
29+++ b/debian/plasma-sdk.lintian-overrides
30@@ -1,3 +1,5 @@
31-plasma-sdk: script-not-executable usr/share/kpackage/genericqml/org.kde.plasma.themeexplorer/contents/code/openInEditor.sh
32 plasma-sdk: script-not-executable usr/share/applications/cuttlefish.desktop
33+plasma-sdk: script-not-executable usr/share/applications/plasmate.desktop
34+plasma-sdk: script-not-executable usr/share/kpackage/genericqml/org.kde.plasma.themeexplorer/contents/code/openInEditor.sh
35 plasma-sdk: unusual-interpreter usr/share/applications/cuttlefish.desktop #!xdg-open
36+plasma-sdk: unusual-interpreter usr/share/applications/plasmate.desktop #!xdg-open

Subscribers

People subscribed via source and target branches