[SCM] kconfig packaging branch, master, updated. debian/5.37.0-2-107-gd21f3fc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfig.git;a=commitdiff;h=b06edb6

The following commit has been merged in the master branch:
commit b06edb663324e469104d03f66ef412013e357b99
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 25 11:14:51 2018 -0300

    Fix cross compilation issues
    
    + Move kconfig_compiler to an arch independant path
    + Move cmake files back to the -dev package
    + Rename -bin-dev package to -dev-bin
    
    Closes: 887452
    Thanks: Helmut Grohne for the analysis and suggestions
    Gbp-Dch: Full
---
 debian/control                      | 60 +++++++++++++++++++------------------
 debian/libkf5config-bin-dev.install |  2 --
 debian/libkf5config-dev-bin.install |  1 +
 debian/libkf5config-dev.install     |  1 +
 debian/rules                        |  2 +-
 5 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 6e8c881..3eecc99 100644
--- a/debian/control
+++ b/debian/control
@@ -44,34 +44,6 @@ Description: configuration settings framework for Qt
  .
  This package contains runtime files for KConfig.
 
-Package: libkf5config-bin-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Breaks: libkf5config-dev (<< 5.15.0-2~)
-Replaces: libkf5config-dev (<< 5.15.0-2~)
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: configuration settings framework for Qt -- binary package
- KConfig provides an advanced configuration system. It is made of two
- parts: KConfigCore and KConfigGui.
- .
- KConfigCore provides access to the configuration files themselves. It
- features:
- .
-  - centralized definition: define your configuration in an XML file
-  and use `kconfig_compiler` to generate classes to read and write
-  configuration entries.
-  - lock-down (kiosk) support.
- .
- KConfigGui provides a way to hook widgets to the configuration so
- that they are automatically initialized from the configuration and
- automatically propagate their changes to their respective
- configuration files.
- .
- This package is part of KDE Frameworks 5.
- .
- This package contains the binary files for the libkf5config-dev package.
-
 Package: libkf5config-data
 Architecture: all
 Multi-Arch: foreign
@@ -102,18 +74,20 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libkf5config-bin (= ${binary:Version}),
-         libkf5config-bin-dev (= ${binary:Version}),
+         libkf5config-dev-bin (= ${binary:Version}),
          libkf5configcore5 (= ${binary:Version}),
          libkf5configgui5 (= ${binary:Version}),
          qtbase5-dev (>= 5.7.0~),
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: libkf5completion-dev (<< 5.41),
+        libkf5config-bin-dev (<< 5.42),
         libkf5configwidgets-dev (<< 5.41),
         libkf5notifications-dev (<< 5.41),
         libkf5service-dev (<< 5.41),
         libkf5wallet-dev (<< 5.41),
         libkf5xmlgui-dev (<< 5.41),
+Replaces: libkf5config-bin-dev (<< 5.42)
 Recommends: libkf5config-doc (= ${source:Version})
 Description: configuration settings framework for Qt
  KConfig provides an advanced configuration system. It is made of two
@@ -136,6 +110,34 @@ Description: configuration settings framework for Qt
  .
  This package contains the development files.
 
+Package: libkf5config-dev-bin
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Breaks: libkf5config-dev (<< 5.15.0-2~)
+Replaces: libkf5config-dev (<< 5.15.0-2~)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: configuration settings framework for Qt -- binary package
+ KConfig provides an advanced configuration system. It is made of two
+ parts: KConfigCore and KConfigGui.
+ .
+ KConfigCore provides access to the configuration files themselves. It
+ features:
+ .
+  - centralized definition: define your configuration in an XML file
+  and use `kconfig_compiler` to generate classes to read and write
+  configuration entries.
+  - lock-down (kiosk) support.
+ .
+ KConfigGui provides a way to hook widgets to the configuration so
+ that they are automatically initialized from the configuration and
+ automatically propagate their changes to their respective
+ configuration files.
+ .
+ This package is part of KDE Frameworks 5.
+ .
+ This package contains the binary files for the libkf5config-dev package.
+
 Package: libkf5config-doc
 Architecture: all
 Multi-Arch: foreign
diff --git a/debian/libkf5config-bin-dev.install b/debian/libkf5config-bin-dev.install
deleted file mode 100644
index 1443c8b..0000000
--- a/debian/libkf5config-bin-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/cmake/KF5Config/KF5ConfigCompilerTargets*.cmake
-usr/lib/*/libexec/kf5/kconfig_compiler_kf5
diff --git a/debian/libkf5config-dev-bin.install b/debian/libkf5config-dev-bin.install
new file mode 100644
index 0000000..9e1f921
--- /dev/null
+++ b/debian/libkf5config-dev-bin.install
@@ -0,0 +1 @@
+usr/lib/libexec/kf5/kconfig_compiler_kf5
diff --git a/debian/libkf5config-dev.install b/debian/libkf5config-dev.install
index 33ec312..7bb63a6 100644
--- a/debian/libkf5config-dev.install
+++ b/debian/libkf5config-dev.install
@@ -1,6 +1,7 @@
 usr/include/KF5/KConfigCore/
 usr/include/KF5/KConfigGui/
 usr/include/KF5/kconfig_version.h
+usr/lib/*/cmake/KF5Config/KF5ConfigCompilerTargets*.cmake
 usr/lib/*/cmake/KF5Config/KF5ConfigConfig*.cmake
 usr/lib/*/cmake/KF5Config/KF5ConfigMacros.cmake
 usr/lib/*/cmake/KF5Config/KF5ConfigQchTargets.cmake
diff --git a/debian/rules b/debian/rules
index 2d841e8..890dce5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DKCONFIG_COMPILER_INSTALL_DIR="lib/libexec/kf5"
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5config5-dbg (<= 5.19.0-1~~)'

-- 
kconfig packaging