[neon/kf6/threadweaver/Neon/unstable] debian: kf sixy

[Jonathan Esk-Riddell]

Git commit 0842e8525d5c16be2f00a1f55fe6b0b26183a2ee by Jonathan Esk-Riddell.
Committed on 24/01/2023 at 12:12.
Pushed by jriddell into branch 'Neon/unstable'.

kf sixy

M  +2    -2    debian/changelog
M  +3    -3    debian/control
M  +1    -1    debian/kf6-threadweaver-dev.install
M  +0    -2    debian/kf6-threadweaver.install
M  +3    -0    debian/rules

https://invent.kde.org/neon/kf6/threadweaver/commit/0842e8525d5c16be2f00a1f55fe6b0b26183a2ee

diff --git a/debian/changelog b/debian/changelog
index a6ab07f..1a92aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-kf6-threadweaver (0.0-0neon) focal; urgency=medium
+kf6-threadweaver (0.0-0neon) UNRELEASED; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Tue, 15 Mar 2022 13:53:51 +0000
+ -- Jonathan Esk-Riddell <jr at jriddell.org>  Mon, 12 Dec 2022 13:04:30 +0000
diff --git a/debian/control b/debian/control
index 54ab656..a4e8c9b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: libs
 Priority: optional
 Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
 Build-Depends: cmake,
+               debhelper-compat,
                debhelper-compat (= 13),
                doxygen,
-               kf6-extra-cmake-modules,
                graphviz,
+               kf6-extra-cmake-modules,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qt6-tools-dev
@@ -35,8 +36,7 @@ Package: kf6-threadweaver-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: kf6-threadweaver (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
-Recommends: kf6-threadweaver (= ${source:Version})
+Depends: kf6-threadweaver, ${misc:Depends}, ${shlibs:Depends}
 Description: ThreadWeaver library to help multithreaded programming in Qt
  ThreadWeaver is a helper for multithreaded programming. It uses a job-based
  interface to queue tasks and execute them in an efficient way.  You simply
diff --git a/debian/kf6-threadweaver-dev.install b/debian/kf6-threadweaver-dev.install
index 27990ca..c71c4bc 100644
--- a/debian/kf6-threadweaver-dev.install
+++ b/debian/kf6-threadweaver-dev.install
@@ -1,4 +1,4 @@
 usr/kf6/include/KF6/ThreadWeaver/
 usr/kf6/lib/*/cmake/KF5ThreadWeaver/
 usr/kf6/lib/*/libKF5ThreadWeaver.so
-usr/kf6/mkspecs/modules/qt_ThreadWeaver.pri
+usr/kf6/mkspecs/
diff --git a/debian/kf6-threadweaver.install b/debian/kf6-threadweaver.install
index 64e3314..5c28c4b 100644
--- a/debian/kf6-threadweaver.install
+++ b/debian/kf6-threadweaver.install
@@ -1,4 +1,2 @@
 usr/kf6/lib/*/libKF5ThreadWeaver.so.5
-usr/kf6/lib/*/libKF5ThreadWeaver.so.5
-usr/kf6/lib/*/libKF5ThreadWeaver.so.5.*
 usr/kf6/lib/*/libKF5ThreadWeaver.so.5.*
diff --git a/debian/rules b/debian/rules
index 5bd7734..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,6 @@
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/