[neon/kde/akonadi-import-wizard/Neon/unstable] debian: port to kf6

[Carlos De Maine]

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

port to kf6

M  +2    -2    debian/akonadi-import-wizard.install
M  +26   -26   debian/control
M  +2    -2    debian/libkpimimportwizard-dev.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/akonadi-import-wizard/-/commit/2de295918fcfc7f0c79d492097ca46933a76c926

diff --git a/debian/akonadi-import-wizard.install b/debian/akonadi-import-wizard.install
index 2385372..c885cc1 100644
--- a/debian/akonadi-import-wizard.install
+++ b/debian/akonadi-import-wizard.install
@@ -5,5 +5,5 @@ usr/share/doc
 usr/share/icons
 usr/share/importwizard
 usr/share/locale
-usr/share/qlogging-categories5/importwizard.categories
-usr/share/qlogging-categories5/importwizard.renamecategories
+usr/share/qlogging-categories6/importwizard.categories
+usr/share/qlogging-categories6/importwizard.renamecategories
diff --git a/debian/control b/debian/control
index 80bd4ef..e9d310b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,31 +10,31 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.1~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5auth-dev (>= 5.47.0~),
-               libkf5config-dev (>= 5.47.0~),
-               libkf5contacts-dev (>= 4:18.08.3~),
-               libkf5crash-dev (>= 5.47.0~),
-               libkf5dbusaddons-dev (>= 5.47.0~),
-               libkf5doctools-dev (>= 5.47.0~),
-               libkf5identitymanagement-dev (>= 18.08.3~),
-               libkf5kio-dev (>= 5.47.0~),
-               libkf5libkdepim-dev (>= 4:18.08.3~),
-               libkf5mailcommon-dev (>= 4:18.08.3~),
-               libkf5mailimporter-dev (>= 4:18.08.3~),
-               libkf5mailtransport-dev (>= 18.08.3~),
-               libkf5messageviewer-dev (>= 4:18.08.3~),
-               libkf5pimcommon-dev (>= 4:18.08.3~),
-               libkf5templateparser-dev,
-               libkf5ktextaddons-dev,
-               libkf5wallet-dev (>= 5.47.0~),
-               libkf5webengineviewer-dev,
+               kf6-extra-cmake-modules,
+               kf6-kauth-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kio-dev,
+               kf6-ktextaddons-dev,
+               kf6-kwallet-dev,
+               kpim6-akonadi-dev,
+               kpim6-contacts-dev,
+               kpim6-identitymanagement-dev,
+               kpim6-kdepim-dev,
+               kpim6-mailcommon-dev,
+               kpim6-mailimporter-dev,
+               kpim6-mailtransport-dev,
+               kpim6-messagelib-dev,
+               kpim6-messageviewer-dev,
+               kpim6-pimcommon-dev,
+               kpim6-templateparser-dev,
                libqgpgme-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qt5keychain-dev,
-               qtbase5-dev (>= 5.9.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qtkeychain-qt6-dev
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi-import-wizard
@@ -43,7 +43,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-import-wizard.git
 Package: akonadi-import-wizard
 Section: mail
 Architecture: any
-Depends: libkpimimportwizard5  (= ${binary:Version}),
+Depends: kpim6-importwizard (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kdepim-doc (<< 4:17.08~),
@@ -62,8 +62,8 @@ Package: libkpimimportwizard-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5mailtransport-dev (>= 18.08.3~),
-         libkpimimportwizard5  (= ${binary:Version}),
+Depends: kpim6-importwizard (= ${binary:Version}),
+         kpim6-mailtransport-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: PIM data import wizard - devel files
diff --git a/debian/libkpimimportwizard-dev.install b/debian/libkpimimportwizard-dev.install
index d3b93a9..12fedf5 100644
--- a/debian/libkpimimportwizard-dev.install
+++ b/debian/libkpimimportwizard-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/
-usr/lib/*/cmake/KPimImportWizard/
+usr/include/KPim6/
 usr/lib/*/cmake/KPim5ImportWizard/
+usr/lib/*/cmake/KPimImportWizard/
 usr/lib/*/libKPim5ImportWizard.so
diff --git a/debian/rules b/debian/rules
index 4d8f988..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>
 
-l10npkgs_firstversion_ok := 4:16.04.3-9~
-
-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
-
-# Strict local dependencies (there are no external ones anyway)
-override_dh_makeshlibs:
-	$(overridden_command) -V
+%:
+	dh $@ --with kf6 --buildsystem kf6