[neon/kde/kmbox/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit c461561f52a3dcc9f2231ecaf998fc76174072fa by Carlos De Maine.
Committed on 24/09/2023 at 08:05.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +8    -9    debian/control
M  +2    -2    debian/libkf5mbox-dev.install
M  +1    -1    debian/libkf5mbox5.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/kmbox/-/commit/c461561f52a3dcc9f2231ecaf998fc76174072fa

diff --git a/debian/control b/debian/control
index 306a781..7349cf1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,11 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.19.0~),
+               kf6-extra-cmake-modules,
+               kpim6-mime-dev,
                libboost-dev,
-               libkf5kdelibs4support-dev (>= 5.12.0~),
-               libkf5mime-dev (>= 5.2.0~),
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kmbox
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kmbox.git
@@ -19,10 +18,10 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmbox.git
 Package: libkf5mbox-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5codecs-dev,
-         libkf5mbox5 (= ${binary:Version}),
-         libkf5mime-dev (>= 5.2.0~),
-         qtbase5-dev,
+Depends: kf6-codecs-dev,
+         kpim6-mbox (= ${binary:Version}),
+         kpim6-mime-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: library for handling mbox mailboxes - development files
  This is a library for handling mailboxes in mbox format, using a Qt/KMime C++
diff --git a/debian/libkf5mbox-dev.install b/debian/libkf5mbox-dev.install
index 7dc8374..e4e8866 100644
--- a/debian/libkf5mbox-dev.install
+++ b/debian/libkf5mbox-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/KMbox/
+usr/include/KPim6/KMbox/
 usr/lib/*/cmake/KPim5Mbox/
 usr/lib/*/libKPim5Mbox.so
-usr/lib/*/qt5/mkspecs/modules/qt_KMbox.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KMbox.pri
diff --git a/debian/libkf5mbox5.install b/debian/libkf5mbox5.install
index e2bf47a..1d17c92 100644
--- a/debian/libkf5mbox5.install
+++ b/debian/libkf5mbox5.install
@@ -1,3 +1,3 @@
 usr/lib/*/libKPim5Mbox.so.5
 usr/lib/*/libKPim5Mbox.so.5.*
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/rules b/debian/rules
index e35da09..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libkf5mbox-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6