[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6b2f503071cf9e12b291bf0f449c39cd77fc6a03
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Dec 12 11:16:26 2017 -0300

    Rename libkf5coreaddons-bin-dev to libkf5coreaddons-dev-bin
    
    Move the cmake file to the m-a: same -dev package, and add the
    corresponding breaks replaces.
    
    Closes: 882692
    Thanks: Helmut Grohne <helmut at subdivi.de>
    Gbp-Dch: Full
---
 debian/control                          | 8 +++++---
 debian/libkf5coreaddons-bin-dev.install | 2 --
 debian/libkf5coreaddons-dev-bin.install | 1 +
 debian/libkf5coreaddons-dev.install     | 5 +----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 8279d84..20dfa74 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: http://projects.kde.org/kcoreaddons
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kcoreaddons.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kcoreaddons.git
 
-Package: libkf5coreaddons-bin-dev
+Package: libkf5coreaddons-dev-bin
 Section: libdevel
 Architecture: any
 Multi-Arch: foreign
@@ -35,7 +35,7 @@ Description: KDE Frameworks 5 addons to QtCore - development files
  .
  This package is part of KDE Frameworks 5.
  .
- This package contains the binary development files for KCoreAddons.
+ This package is an implementation detail for KCoreAddons.
 
 Package: libkf5coreaddons-data
 Architecture: all
@@ -57,11 +57,12 @@ Package: libkf5coreaddons-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5coreaddons-bin-dev (= ${binary:Version}),
+Depends: libkf5coreaddons-dev-bin (= ${binary:Version}),
          libkf5coreaddons5 (= ${binary:Version}),
          qtbase5-dev (>= 5.7.0~),
          ${shlibs:Depends},
 Replaces: libkf5service-dev (<= 5.2.0)
+          libkf5coreaddons-bin-dev (<< 5.41),
 Breaks: baloo-kf5-dev (<< 5.37),
         kded5-dev (<< 5.37),
         libkf5auth-dev (<< 5.37),
@@ -72,6 +73,7 @@ Breaks: baloo-kf5-dev (<< 5.37),
         libkf5package-dev (<< 5.37),
         libkf5pty-dev (<< 5.37),
         libkf5service-dev (<< 5.37),
+        libkf5coreaddons-bin-dev (<< 5.41),
 Recommends: libkf5coreaddons-doc (= ${source:Version})
 Description: KDE Frameworks 5 addons to QtCore - development files
  KCoreAddons provides classes built on top of QtCore to perform various tasks
diff --git a/debian/libkf5coreaddons-bin-dev.install b/debian/libkf5coreaddons-bin-dev.install
deleted file mode 100644
index 660d56d..0000000
--- a/debian/libkf5coreaddons-bin-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/desktoptojson
-usr/lib/*/cmake/KF5CoreAddons/KF5CoreAddonsToolingTargets*.cmake
diff --git a/debian/libkf5coreaddons-dev-bin.install b/debian/libkf5coreaddons-dev-bin.install
new file mode 100644
index 0000000..b5e10c0
--- /dev/null
+++ b/debian/libkf5coreaddons-dev-bin.install
@@ -0,0 +1 @@
+usr/bin/desktoptojson
diff --git a/debian/libkf5coreaddons-dev.install b/debian/libkf5coreaddons-dev.install
index f2581fc..7e710d9 100644
--- a/debian/libkf5coreaddons-dev.install
+++ b/debian/libkf5coreaddons-dev.install
@@ -1,8 +1,5 @@
 usr/include/KF5/KCoreAddons/
 usr/include/KF5/kcoreaddons_version.h
-usr/lib/*/cmake/KF5CoreAddons/KF5CoreAddonsConfig*.cmake
-usr/lib/*/cmake/KF5CoreAddons/KF5CoreAddonsMacros.cmake
-usr/lib/*/cmake/KF5CoreAddons/KF5CoreAddonsQchTargets.cmake
-usr/lib/*/cmake/KF5CoreAddons/KF5CoreAddonsTargets*.cmake
+usr/lib/*/cmake/KF5CoreAddons/
 usr/lib/*/libKF5CoreAddons.so
 usr/lib/*/qt5/mkspecs/modules/qt_KCoreAddons.pri

-- 
kcoreaddons packaging