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

[Carlos De Maine]

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

port to kf6

M  +12   -14   debian/control
M  +1    -1    debian/libkpimitinerary-data.install
M  +3    -3    debian/libkpimitinerary-dev.install
M  +4    -5    debian/rules

https://invent.kde.org/neon/kde/kitinerary/-/commit/9ae39253dc3f1cff3afd213198559e9be0454371

diff --git a/debian/control b/debian/control
index bf0ab36..6ce2856 100644
--- a/debian/control
+++ b/debian/control
@@ -5,23 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sandro Knauß <hefee at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 11),
-               extra-cmake-modules (>= 5.38~),
-               libkf5calendarcore-dev,
-               libkf5contacts-dev,
-               libkf5i18n-dev,
-               libkf5mime-dev,
+               kf6-extra-cmake-modules,
+               kf6-ki18n-dev,
+               kpim6-calendar-dev,
+               kpim6-contacts-dev,
+               kpim6-mime-dev,
                libkpimpkpass-dev,
                libphonenumber-dev,
                libpoppler-private-dev,
-               libpoppler-qt5-dev,
+               libpoppler-qt6-dev,
                libxml2-dev,
                libzxingcore-dev,
                pkg-config,
-               pkg-kde-tools,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtdeclarative5-dev,
-               qtdeclarative5-private-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
                xauth,
                xvfb,
                zlib1g-dev
@@ -46,10 +44,10 @@ Package: libkpimitinerary-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5mime-dev,
-         libkpimitinerary5 (= ${binary:Version}),
+Depends: kpim6-itinerary (= ${binary:Version}),
+         kpim6-mime-dev,
          libkpimpkpass-dev,
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends}
 Description: library for Travel Reservation information - development files
  This library provides an API for Data Model and Extraction System for
diff --git a/debian/libkpimitinerary-data.install b/debian/libkpimitinerary-data.install
index baf91c4..edd63e9 100644
--- a/debian/libkpimitinerary-data.install
+++ b/debian/libkpimitinerary-data.install
@@ -1,3 +1,3 @@
 usr/share/locale/
 usr/share/mime/packages/application-vnd-kde-itinerary.xml
-usr/share/qlogging-categories5/org_kde_kitinerary.categories
+usr/share/qlogging-categories6/org_kde_kitinerary.categories
diff --git a/debian/libkpimitinerary-dev.install b/debian/libkpimitinerary-dev.install
index 87e123f..cf99e40 100644
--- a/debian/libkpimitinerary-dev.install
+++ b/debian/libkpimitinerary-dev.install
@@ -1,6 +1,6 @@
-usr/include/KPim5/KItinerary/
-usr/include/KPim5/kitinerary/
-usr/include/KPim5/kitinerary_version.h
+usr/include/KPim6/KItinerary/
+usr/include/KPim6/kitinerary/
+usr/include/KPim6/kitinerary_version.h
 usr/lib/*/cmake/KPim5Itinerary
 usr/lib/*/cmake/KPimItinerary/
 usr/lib/*/libKPim5Itinerary.so
diff --git a/debian/rules b/debian/rules
index e47cd7e..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +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
-
-override_dh_auto_test:
-	xvfb-run --\
-	           dh_auto_test --no-parallel
+%:
+	dh $@ --with kf6 --buildsystem kf6