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

[Clive Johnston]

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
-- 
https://code.launchpad.net/~gsilvapt/kubuntu-packaging/+git/ksirk/+merge/329403
Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/ksirk:kubuntu_unstable.