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

[Carlos De Maine]

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

port to kf6

M  +11   -13   debian/control
M  +1    -1    debian/libkf5kontactinterface-data.install
M  +2    -2    debian/libkf5kontactinterface-dev.install
M  +4    -11   debian/rules

https://invent.kde.org/neon/kde/kontactinterface/-/commit/d741875ca52166ac779e8aa8326b87c68ee37a29

diff --git a/debian/control b/debian/control
index 27e43d3..fcfc503 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,15 @@ 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~),
-               libkf5coreaddons-dev (>= 5.19.0~),
-               libkf5i18n-dev (>= 5.19.0~),
-               libkf5iconthemes-dev (>= 5.19.0~),
-               libkf5parts-dev (>= 5.19.0~),
-               libkf5windowsystem-dev (>= 5.19.0~),
-               libkf5xmlgui-dev (>= 5.19.0~),
-               libqt5x11extras5-dev,
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kparts-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
                libx11-dev,
-               pkg-kde-tools (>> 0.15.15)
+               pkg-kde-tools-neon
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kontactinterface
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kontactinterface.git
@@ -23,9 +22,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kontactinterface.gi
 Package: libkf5kontactinterface-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5kdelibs4support-dev,
-         libkf5kontactinterface5 (= ${binary:Version}),
-         libkf5parts-dev (>= 5.19.0~),
+Depends: kf6-kparts-dev,
+         kpim6-kontactinterface (= ${binary:Version}),
          ${misc:Depends}
 Description: Kontact interface library - development files
  This library provides the glue necessary for application "Parts" to be
@@ -46,7 +44,7 @@ Description: Kontact interface library - data files
 Package: libkf5kontactinterface5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5kontactinterface-data (= ${source:Version}),
+Depends: kpim6-kcontactinterface (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: ${kde-l10n:all}
diff --git a/debian/libkf5kontactinterface-data.install b/debian/libkf5kontactinterface-data.install
index 1f8c9bc..82ce3b1 100644
--- a/debian/libkf5kontactinterface-data.install
+++ b/debian/libkf5kontactinterface-data.install
@@ -1 +1 @@
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/libkf5kontactinterface-dev.install b/debian/libkf5kontactinterface-dev.install
index f0f67e9..9cdaf1b 100644
--- a/debian/libkf5kontactinterface-dev.install
+++ b/debian/libkf5kontactinterface-dev.install
@@ -1,4 +1,4 @@
-usr/include/KPim5/KontactInterface/
+usr/include/KPim6/KontactInterface/
 usr/lib/*/cmake/KPim5KontactInterface/
 usr/lib/*/libKPim5KontactInterface.so
-usr/lib/*/qt5/mkspecs/modules/qt_KontactInterface.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KontactInterface.pri
diff --git a/debian/rules b/debian/rules
index c0247b7..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='libkf5kontactinterface-dbg (<= 15.12.1-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6