[Merge] ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable

[Simon Quigley]

Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs/+merge/300987

This fixes the merge errors that were happening due to some dependency conflicts in debian/control.
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2166 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20160724/0bf377c1/attachment-0001.diff>