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

[Simon Quigley]

Thanks Achim.

I fixed some things, I think it's better now.
-- 
https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor/+merge/301586
Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/cantor:kubuntu_unstable.