[neon/neon-packaging/mimetreeparser/Neon/unstable] debian: port to kf6

[Carlos De Maine]

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

port to kf6

M  +10   -13   debian/control
M  +2    -2    debian/kf5-mimetreeparser-dev.install
M  +1    -1    debian/kf5-mimetreeparser.install
M  +4    -9    debian/rules

https://invent.kde.org/neon/neon-packaging/mimetreeparser/-/commit/46d3953bc1a181a1f96f40a10af0ed1bacc7ef60

diff --git a/debian/control b/debian/control
index c86d16f..4b2464c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,17 @@ Priority: optional
 Maintainer: KDE Neon neon at kde.org
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
+               kf6-extra-cmake-modules,
+               kf6-kdeclarative-dev,
+               kf6-ki18n-dev,
+               kpim6-calendar-dev,
+               kpim6-kleo-dev,
+               kpim6-mbox-dev,
+               kpim6-mime-dev,
                libgpgme-dev,
-               libkf5calendarcore-dev,
-               libkf5declarative-dev,
-               libkf5i18n-dev,
-               libkf5libkleo-dev,
-               libkf5mbox-dev,
-               libkf5mime-dev,
                libqgpgme-dev,
-               pkg-kde-tools,
-               qtbase5-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/pim/mimetreeparser
 
@@ -35,9 +35,7 @@ Description: library for handling MIME data
 Package: kf5-mimetreeparser-dev
 Section: libdevel
 Architecture: any
-Depends: kf5-mimetreeparser,
-         qtbase5-dev,
-         ${misc:Depends}
+Depends: kpim6-mimetreeparser, qt6-base-dev, ${misc:Depends}
 Description: library for handling MIME data - development files
  This library is a parser for a MIME tree and is based on KMime. The
  goal is given a MIME tree to extract a list of parts (e.g. text, html) and a
@@ -45,4 +43,3 @@ Description: library for handling MIME data - development files
  encrypted part.
  .
  This package contains the development files.
-
diff --git a/debian/kf5-mimetreeparser-dev.install b/debian/kf5-mimetreeparser-dev.install
index a39a02e..7cc0054 100644
--- a/debian/kf5-mimetreeparser-dev.install
+++ b/debian/kf5-mimetreeparser-dev.install
@@ -1,5 +1,5 @@
-usr/include/KPim5/
+usr/include/KPim6/
 usr/lib/*/cmake/
 usr/lib/*/libKPim5MimeTreeParserCore.so
 usr/lib/*/libKPim5MimeTreeParserWidgets.so
-usr/lib/*/qt5/mkspecs/
+usr/lib/*/qt6/mkspecs/
diff --git a/debian/kf5-mimetreeparser.install b/debian/kf5-mimetreeparser.install
index a96c9df..bdf41f6 100644
--- a/debian/kf5-mimetreeparser.install
+++ b/debian/kf5-mimetreeparser.install
@@ -2,4 +2,4 @@ usr/lib/*/libKPim5MimeTreeParserCore.so.*
 usr/lib/*/libKPim5MimeTreeParserWidgets.so.*
 usr/lib/*/qt5/qml/org/kde/pim/mimetreeparser/
 usr/share/locale/
-usr/share/qlogging-categories5/mimetreeparser2.categories
+usr/share/qlogging-categories6/mimetreeparser2.categories
diff --git a/debian/rules b/debian/rules
index 04fff11..3d69b0d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-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='libkf5mimetreeparser-dbg (<= 15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6