Merge lp:~panfaust/kubuntu-packaging-next/kconfig-work into lp:~kubuntu-packagers/kubuntu-packaging-next/kconfig

[Jose Manuel Santamaria Lema]

* Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to libkf5config-bin.
* Library packages now recommend libkf5config-bin.
* The -dev package depends on -bin because when building other KF5 components cmake fails if kconf_update is not found; however this shouldn't not be neccesary, it's an upstream bug, when solved this dependency should be removed.

[lp:~panfaust/kubuntu-packaging-next/kconfig-work]

31. By Scarlett Gately Moore on 2014-06-21

Merge:
[ José Manuel Santamaría Lema ]
* Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to
  libkf5config-bin.
* Library packages now recommend libkf5config-bin.
* The -dev package depends on -bin because when building other KF5 components
  cmake fails if kconf_update is not found; however this should not be
  neccesary, it's an upstream bug, when solved this dependency should be
  removed.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-05 11:39:41 +0000
+++ debian/changelog	2014-06-19 19:26:36 +0000
@@ -10,6 +10,15 @@
   * Remove useless Pre-Depends fields used for multiarch compat in
     releases older than trusty
 
+  [ José Manuel Santamaría Lema ]
+  * Move /usr/lib/*/libexec/kf5/kconf_update from libkf5configcore5 to
+    libkf5config-bin.
+  * Library packages now recommend libkf5config-bin.
+  * The -dev package depends on -bin because when building other KF5 components
+    cmake fails if kconf_update is not found; however this should not be
+    neccesary, it's an upstream bug, when solved this dependency should be
+    removed.
+
  -- Jonathan Riddell <[e-mail]>  Mon, 02 Jun 2014 13:35:25 +0100
 
 kconfig (4.99.0-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/control'
--- debian/control	2014-06-05 11:39:41 +0000
+++ debian/control	2014-06-19 19:26:36 +0000
@@ -19,6 +19,7 @@
 Architecture: any
 Depends: libkf5configcore5 (= ${binary:Version}),
          libkf5configgui5 (= ${binary:Version}),
+         libkf5config-bin (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -49,6 +50,7 @@
 Depends: libkf5config-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: libkf5config-bin (= ${binary:Version})
 Description: configuration settings framework for Qt
  KConfig provides an advanced configuration system. It is made of two
  parts: KConfigCore and KConfigGui.
@@ -76,6 +78,7 @@
 Depends: libkf5config-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: libkf5config-bin (= ${binary:Version})
 Description: configuration settings framework for Qt
  KConfig provides an advanced configuration system. It is made of two
  parts: KConfigCore and KConfigGui.
@@ -125,6 +128,8 @@
 Package: libkf5config-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5configcore5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
+Replaces: libkf5configcore5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
 Description: configuration settings framework for Qt
  KConfig provides an advanced configuration system. It is made of two
  parts: KConfigCore and KConfigGui.
@@ -144,7 +149,7 @@
  .
  This package is part of KDE Frameworks 5.
  .
- This package contains the kreadconfig5 and kwriteconfig5 binaries.
+ This package contains runtime files for KConfig.
 
 Package: libkf5config5-dbg
 Priority: extra

=== modified file 'debian/libkf5config-bin.install'
--- debian/libkf5config-bin.install	2014-06-03 12:40:55 +0000
+++ debian/libkf5config-bin.install	2014-06-19 19:26:36 +0000
@@ -1,2 +1,3 @@
 usr/bin/kreadconfig5
 usr/bin/kwriteconfig5
+usr/lib/*/libexec/kf5/kconf_update

=== modified file 'debian/libkf5configcore5.install'
--- debian/libkf5configcore5.install	2014-05-21 15:27:12 +0000
+++ debian/libkf5configcore5.install	2014-06-19 19:26:36 +0000
@@ -1,3 +1,2 @@
 usr/lib/*/libKF5ConfigCore*.so.4*
 usr/lib/*/libKF5ConfigCore*.so.5
-usr/lib/*/libexec/kf5/kconf_update