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

[Gustavo Silva]

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

[Rik Mills (rikmills)]

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

[Gustavo Silva (gsilvapt)]

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!

[Clive Johnston (clivejo)]

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

Unmerged commits

52d5858... by Gustavo Silva on 2017-08-22

Added rule to file missing

8535a50... by Gustavo Silva on 2017-08-22

Change lintian override path to new specification

e9b70e2... by Gustavo Silva on 2017-08-22

Added version of dependency

62ef82e... by Gustavo Silva on 2017-08-22

Fix b-d for KF5 and QT5

diff --git a/debian/control b/debian/control
index ec2d6cb..56cbcc8 100644
--- a/debian/control
+++ b/debian/control
@@ -28,9 +28,15 @@ Build-Depends: cmake,
                libkf5wallet-dev (>= 5.15.0),
                libkf5widgetsaddons-dev (>= 5.15.0),
                libkf5xmlgui-dev (>= 5.15.0),
+<<<<<<< debian/control
                libphonon4qt5-dev,
                libqca-qt5-2-dev (>= 2.1.0),
                libqt5svg5-dev (>= 5.2.0),
+=======
+               libphonon4qt5-dev (>= 4.9.51),
+               libqca-qt5-2-dev (>= 2.1.0),
+               libqt5svg5-dev(>= 5.2.0),
+>>>>>>> debian/control
                pkg-config,
                pkg-kde-tools (>= 0.14),
                qtbase5-dev (>= 5.2.0),
diff --git a/debian/ksirk.lintian-overrides b/debian/ksirk.lintian-overrides
index edb5c63..62852a3 100644
--- a/debian/ksirk.lintian-overrides
+++ b/debian/ksirk.lintian-overrides
@@ -1 +1 @@
-ksirk: embedded-library usr/games/ksirk: libidn
+irk: embedded-library usr/lib/*/libiris_ksirk.so.2.0.0: libidn
diff --git a/debian/not-installed b/debian/not-installed
index 879d216..6488784 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1,2 @@
 ./usr/lib/libiris_ksirk.a
+./etc/xdg/ksirk.knsrc