kubuntu-packaging

Merge ~gsilvapt/kubuntu-packaging/+git/ksirk:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/ksirk:kubuntu_unstable

  1. Git
  2. lp:~gsilvapt/kubuntu-packaging/+git/ksirk
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Gustavo Silva
Status: Needs review
Proposed branch: ~gsilvapt/kubuntu-packaging/+git/ksirk:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/ksirk:kubuntu_unstable
Diff against target: 34 lines (+8/-1) (has conflicts)
3 files modified
debian/control (+6/-0)
debian/ksirk.lintian-overrides (+1/-1)
debian/not-installed (+1/-0)
Conflict in debian/control
Reviewer Review Type Date Requested Status
Rik Mills Needs Fixing
Review via email: mp+329403@code.qastaging.launchpad.net

Description of the change

Fix KCI build failures.
Builds locally: http://paste.ubuntu.com/25373070/

To post a comment you must log in.
Revision history for this message
Rik Mills (rikmills) wrote :

Hunk #1 - why are you adding a set of duplicated build depends between those <<<<< / >>>>> markers? Looks like an error.

Hunk #2 - the k was missed from ksirk on the lintian override

Hunk #3 - etc/xdg/ksirk.knsrc needs to be installed, not added to not-installed

review: Needs Fixing
Reply
Revision history for this message
Gustavo Silva (gsilvapt) wrote :

Hunk #1 - super strange. It's not duplicate on this end. I'm not sure what I did there, I'll try checking after pushing.

Hunk #2 - Fixed, thanks!

Reply
Revision history for this message
Clive Johnston (clivejo) wrote :

1) Please resolve the merge marker in d/control
2) In d/ksirk.lintian-overrides the package name is ksirk not irk, please fix this typo
3) The file /etc/xdg/ksirk.knsrc needs to be installed, please remove it from not-installed and place it in the proper install file

Reply

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches