[neon/kde/kdeconnect/Neon/experimental] debian: kf6ify

[Carlos De Maine]

Git commit 2fd20dca3bb8a27e0edccee1e3d6b3215dd8f13c by Carlos De Maine.
Committed on 04/08/2023 at 03:36.
Pushed by carlosdem into branch 'Neon/experimental'.

kf6ify

M  +44   -48   debian/control
M  +3    -11   debian/rules

https://invent.kde.org/neon/kde/kdeconnect/-/commit/2fd20dca3bb8a27e0edccee1e3d6b3215dd8f13c

diff --git a/debian/control b/debian/control
index b2c3b5d0..438a79bd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,48 +3,47 @@ Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper-compat (= 12),
-               extra-cmake-modules (>= 5.64.0~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                gettext,
-               kirigami2-dev (>= 5.64.0~),
-               kpeople-vcard,
+               kpeoplevcard6-dev,
                libfakekey-dev,
-               libkf5configwidgets-dev (>= 5.64.0~),
-               libkf5dbusaddons-dev (>= 5.64.0~),
-               libkf5doctools-dev (>= 5.64.0~),
-               libkf5i18n-dev (>= 5.64.0~),
-               libkf5iconthemes-dev (>= 5.64.0~),
-               libkf5kcmutils-dev (>= 5.64.0~),
-               libkf5kio-dev (>= 5.64.0~),
-               libkf5notifications-dev (>= 5.64.0~),
-               libkf5package-dev,
-               libkf5people-dev (>= 5.64.0~),
-               libkf5pulseaudioqt-dev,
-               libkf5qqc2desktopstyle-dev,
-               libkf5service-dev (>= 5.64.0~),
-               libkf5wayland-dev (>= 4:5.64.0~),
-               libqca-qt5-2-dev (>= 2.1.0~),
-               libqt5waylandclient5-dev,
-               libqt5x11extras5-dev (>= 5.10.0~),
+               kf6-extra-cmake-modules,
+               kf6-kconfigwidgets-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kirigami2-dev,
+               kf6-kcmutils-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-kpackage-dev,
+               kf6-kpeople-dev,
+               kf6-kpulseaudioqt-dev,
+               kf6-kqqc2desktopstyle-dev,
+               kf6-kservice-dev,
+               kf6-kwayland-dev,
+               kf6-modemmanager-qt-dev,
+               libqca-qt6-2-dev,
                libwayland-bin,
                libwayland-dev,
                libx11-dev,
                libxtst-dev,
-               modemmanager-qt-dev,
                pkg-config,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                plasma-wayland-protocols,
-               qml-module-org-kde-people,
-               qml-module-qtquick-particles2,
-               qtbase5-dev (>= 5.10.0~),
-               qtbase5-private-dev,
-               qtdeclarative5-dev (>= 5.10.0~),
-               qtmultimedia5-dev (>= 5.10.0~),
-               qtquickcontrols2-5-dev,
-               qtwayland5-dev-tools,
+#               qml6-module-org-kde-people,
+               qml6-module-qtquick-particles,
+               qt6-base-dev,
+               qt6-base-private-dev,
+               qt6-declarative-dev,
+               qt6-multimedia-dev,
+               qt6-quickcontrols-dev,
+               qt6-wayland-dev-tools,
+               qt6-waylandclient-dev,
                wayland-protocols
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://kdeconnect.kde.org
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdeconnect.git
@@ -52,25 +51,22 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdeconnect
 
 Package: kdeconnect
 Architecture: any
-Depends: kpeople-vcard,
-#        kde-cli-tools,
-         libqca-qt5-2-plugins,
-         plasma-framework,
-         qml-module-org-kde-kirigami2,
-         qml-module-org-kde-people,
-         qml-module-org-kde-qqc2desktopstyle,
-         qml-module-qt-labs-platform,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-controls2,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick-particles2,
-         qml-module-qtquick2,
+Depends: kpeoplevcard6,
+         kde-cli-tools,
+         libqca-qt6-2-plugins,
+         kf6-plasma-framework,
+         qml6-module-org-kde-kirigami2,
+#         qml6-module-org-kde-people,
+         qml6-module-org-kde-qqc2desktopstyle,
+         qml6-module-qt-labs-platform,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-layouts,
+         qml6-module-qtquick-particles,
+         qml6-module-qtquick,
          sshfs,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: python-nautilus
-Breaks: kdeconnect-common (<< 20.04.3)
-Replaces: kdeconnect-common (<< 20.04.3)
 Description: connect smartphones to your KDE Plasma Workspace
  Tool to integrate the KDE Plasma Workspace with your smartphones and
  similar devices.
diff --git a/debian/rules b/debian/rules
index 120431f3..3d69b0d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with=kf5
-
-override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+	dh $@ --with kf6 --buildsystem kf6