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

[Carlos De Maine]

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

port to kf6

M  +12   -12   debian/control
M  +3    -3    debian/libkpimsmtp-dev.install
M  +3    -6    debian/rules

https://invent.kde.org/neon/kde/ksmtp/-/commit/c31166ee69a86bb1281c3410a473e7495006f60a

diff --git a/debian/control b/debian/control
index a579ece..36594e7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ 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 (>= 10),
-               extra-cmake-modules (>= 5.35.0~),
-               libkf5coreaddons-dev (>= 5.35.0~),
-               libkf5i18n-dev (>= 5.35.0~),
-               libkf5kio-dev (>= 5.35.0~),
-               libkf5mime-dev (>= 17.04.3~),
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kpim6-mime-dev,
                libsasl2-dev,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.7.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.0.0
 Homepage: https://projects.kde.org/projects/kde/pim/ksmtp
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ksmtp
@@ -21,11 +21,11 @@ Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ksm
 Package: libkpimsmtp-dev
 Section: libdevel
 Architecture: any
-Depends: libboost-dev (>= 1.34.0~),
-         libkf5coreaddons-dev (>= 5.31.0~),
-         libkf5kio-dev (>= 5.31.0~),
-         libkf5mime-dev (>= 17.04.3~),
-         libkpimsmtp5 (= ${binary:Version}),
+Depends: kf6-kcoreaddons-dev,
+         kf6-kio-dev,
+         kf6-smtp (= ${binary:Version}),
+         kpim6-mime-dev,
+         libboost-dev (>= 1.34.0~),
          libsasl2-dev,
          ${misc:Depends}
 Description: library for handling SMTP data
diff --git a/debian/libkpimsmtp-dev.install b/debian/libkpimsmtp-dev.install
index a7594e1..ab967ac 100644
--- a/debian/libkpimsmtp-dev.install
+++ b/debian/libkpimsmtp-dev.install
@@ -1,5 +1,5 @@
-usr/share/qlogging-categories5/ksmtp.categories
-usr/include/KPim5/KSMTP/
+usr/include/KPim6/KSMTP/
 usr/lib/*/cmake/KPim5SMTP/
 usr/lib/*/libKPim5SMTP.so
-usr/lib/*/qt5/mkspecs/modules/qt_KSMTP.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KSMTP.pri
+usr/share/qlogging-categories6/ksmtp.categories
diff --git a/debian/rules b/debian/rules
index f471319..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ 
-
-override_dh_auto_test:
-	# Disable auto test at build time, no way to test smtp as it requires network access
-	:
+	dh $@ --with kf6 --buildsystem kf6