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

[Carlos De Maine]

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

port to kf6

M  +10   -11   debian/control
M  +3    -3    debian/libkf5imap-dev.install
M  +2    -2    debian/libkf5imap5.install
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/kimap/-/commit/da3711aaa8a690bc418a407b0e468a84674f1159

diff --git a/debian/control b/debian/control
index 9249d67..d10c142 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,15 @@ 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,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
                kio-dev (>= 5.19.0~),
+               kpim6-mime-dev,
                libboost-dev (>= 1.34.0~),
-               libkf5coreaddons-dev (>= 5.19.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5kdelibs4support-dev (>= 5.12.0~),
-               libkf5mime-dev (>= 15.12~),
                libsasl2-dev,
-               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/kimap
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kimap.git
@@ -23,11 +22,11 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kimap.git
 Package: libkf5imap-dev
 Section: libdevel
 Architecture: any
-Depends: kio-dev (>= 5.19.0~),
+Depends: kf6-kcoreaddons-dev,
+         kio-dev (>= 5.19.0~),
+         kpim6-imap (= ${binary:Version}),
+         kpim6-mime-dev,
          libboost-dev (>= 1.34.0~),
-         libkf5coreaddons-dev (>= 5.19.0~),
-         libkf5imap5 (= ${binary:Version}),
-         libkf5mime-dev (>= 5.2.0~),
          libsasl2-dev,
          ${misc:Depends}
 Description: library for handling IMAP data - development files
diff --git a/debian/libkf5imap-dev.install b/debian/libkf5imap-dev.install
index 10b4e32..b6870c8 100644
--- a/debian/libkf5imap-dev.install
+++ b/debian/libkf5imap-dev.install
@@ -1,7 +1,7 @@
-usr/include/KPim5/KIMAP/
-usr/include/KPim5/KIMAPTest/kimaptest/
+usr/include/KPim6/KIMAP/
+usr/include/KPim6/KIMAPTest/kimaptest/
 usr/lib/*/cmake/KF5IMAP/
 usr/lib/*/cmake/KPim5IMAP/
 usr/lib/*/libKPim5IMAP.so
 usr/lib/*/libkimaptest.a
-usr/lib/*/qt5/mkspecs/modules/qt_KIMAP.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KIMAP.pri
diff --git a/debian/libkf5imap5.install b/debian/libkf5imap5.install
index 4b8a061..38444b7 100644
--- a/debian/libkf5imap5.install
+++ b/debian/libkf5imap5.install
@@ -1,5 +1,5 @@
 usr/lib/*/libKPim5IMAP.so.5
 usr/lib/*/libKPim5IMAP.so.5.*
 usr/share/locale/*/LC_MESSAGES/libkimap5.mo
-usr/share/qlogging-categories5/kimap.categories
-usr/share/qlogging-categories5/kimap.renamecategories
+usr/share/qlogging-categories6/kimap.categories
+usr/share/qlogging-categories6/kimap.renamecategories
diff --git a/debian/rules b/debian/rules
index 2697abd..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:17.03.90-0~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libkf5imap-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6