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

[Carlos De Maine]

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

port to kf6

M  +20   -21   debian/control
M  +6    -6    debian/libkf5mailimporter-dev.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/mailimporter/-/commit/66f5fffd3d1db23898fdae18d3f245f1981d9d2b

diff --git a/debian/control b/debian/control
index 023b1c9..bfab499 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,21 @@ 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~),
-               libkf5akonadi-dev (>= 4:5.2.0~),
-               libkf5akonadicontact-dev (>= 5.2.0~),
-               libkf5akonadimime-dev (>= 5.2.0~),
-               libkf5archive-dev (>= 5.19.0~),
-               libkf5config-dev (>= 5.19.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5kio-dev (>= 5.19.0~),
-               libkf5libkdepim-dev (>= 5.2.1~),
-               libkf5mime-dev (>= 5.2.0~),
-               libkf5pimcommon-dev,
-               libkf5ktextaddons-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4.0~),
-               qttools5-dev (>= 5.4.0~)
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kconfig-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-ktextaddons-dev,
+               kpim6-akonadi-contact-dev,
+               kpim6-akonadi-dev,
+               kpim6-akonadi-mime-dev,
+               kpim6-kdepim-dev,
+               kpim6-mime-dev,
+               kpim6-pimcommon-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-tools-dev
 Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/mailimporter.git
@@ -48,12 +48,11 @@ Description: KDE PIM Mail importer Akonadi library
 Package: libkf5mailimporter-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5akonadi-dev (>= 4:5.2.0~),
-         libkf5akonadimime-dev (>= 5.2.0~),
-         libkf5mailimporter5 (= ${binary:Version}),
-         libkf5mailimporterakonadi5 (= ${binary:Version}),
-         libkf5mime-dev (>= 5.2.0~),
-         qtbase5-dev (>= 5.4.0~),
+Depends: kpim6-akonadi-dev,
+         kpim6-akonadi-mime-dev,
+         kpim6-mailimporter (= ${binary:Version}),
+         kpim6-mime-dev,
+         qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: KDE PIM Mail importer library, devel files
diff --git a/debian/libkf5mailimporter-dev.install b/debian/libkf5mailimporter-dev.install
index a2dc36c..deba3e3 100644
--- a/debian/libkf5mailimporter-dev.install
+++ b/debian/libkf5mailimporter-dev.install
@@ -1,10 +1,10 @@
-usr/include/KPim5/MailImporter/
-usr/include/KPim5/MailImporterAkonadi/
+usr/include/KPim6/MailImporter/
+usr/include/KPim6/MailImporterAkonadi/
 usr/lib/*/cmake/KPim5MailImporter/
 usr/lib/*/cmake/KPim5MailImporterAkonadi/
 usr/lib/*/libKPim5MailImporter.so
 usr/lib/*/libKPim5MailImporterAkonadi.so
-usr/lib/*/qt5/mkspecs/modules/qt_MailImporter.pri
-usr/lib/*/qt5/mkspecs/modules/qt_MailImporterAkonadi.pri
-usr/share/qlogging-categories5/mailimporter.categories
-usr/share/qlogging-categories5/mailimporter.renamecategories
+usr/lib/*/qt6/mkspecs/modules/qt_MailImporter.pri
+usr/lib/*/qt6/mkspecs/modules/qt_MailImporterAkonadi.pri
+usr/share/qlogging-categories6/mailimporter.categories
+usr/share/qlogging-categories6/mailimporter.renamecategories
diff --git a/debian/rules b/debian/rules
index 30b95d6..3d69b0d 100644
--- 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>
 
-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_auto_test:
-	# Disable dh_auto_test at build time
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6