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

[Carlos De Maine]

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

port to kf6

M  +7    -10   debian/control
M  +2    -2    debian/libkf5tnef-dev.install
M  +2    -2    debian/libkf5tnef5.install
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/ktnef/-/commit/b8230e5b8bd3d2018ddf3db50e221ec110e6b65c

diff --git a/debian/control b/debian/control
index 24d98c1..38dfb47 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,13 @@ 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-calendar-dev,
+               kpim6-calendarutils-dev,
+               kpim6-contacts-dev,
                libical-dev,
-               libkf5calendarcore-dev (>= 4:15.12~),
-               libkf5calendarutils-dev (>= 15.12~),
-               libkf5contacts-dev (>= 15.12~),
-               libkf5kdelibs4support-dev (>= 5.19.0~),
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.2.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/ktnef
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/ktnef.git
@@ -21,9 +20,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/ktnef.git
 Package: libkf5tnef-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5calendarcore-dev (>= 4:15.12~),
-         libkf5tnef5 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: kpim6-calendar-dev, kpim6-tnef (= ${binary:Version}), ${misc:Depends}
 Description: library for handling TNEF data - development files
  Ktnef is a library for handling data in the TNEF format (Transport Neutral
  Encapsulation Format, a proprietary format of e-mail attachment used by
diff --git a/debian/libkf5tnef-dev.install b/debian/libkf5tnef-dev.install
index 43226e0..c1cfb61 100644
--- a/debian/libkf5tnef-dev.install
+++ b/debian/libkf5tnef-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/KTNEF/
+usr/include/KPim6/KTNEF/
 usr/lib/*/cmake/KPim5Tnef/
 usr/lib/*/libKPim5Tnef.so
-usr/lib/*/qt5/mkspecs/modules/qt_KTNef.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KTNef.pri
diff --git a/debian/libkf5tnef5.install b/debian/libkf5tnef5.install
index 4760e02..e667318 100644
--- a/debian/libkf5tnef5.install
+++ b/debian/libkf5tnef5.install
@@ -1,5 +1,5 @@
 usr/lib/*/libKPim5Tnef.so.5
 usr/lib/*/libKPim5Tnef.so.5.*
 usr/share/locale/
-usr/share/qlogging-categories5/ktnef.categories
-usr/share/qlogging-categories5/ktnef.renamecategories
+usr/share/qlogging-categories6/ktnef.categories
+usr/share/qlogging-categories6/ktnef.renamecategories
diff --git a/debian/rules b/debian/rules
index 3d6aabd..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='libkf5tnef-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6