[neon/extras/elisa/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit 79ac52dbe696111f31400796d81c3f5c87eeb086 by Carlos De Maine.
Committed on 15/09/2023 at 05:03.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +27   -32   debian/control
M  +3    -7    debian/rules

https://invent.kde.org/neon/extras/elisa/-/commit/79ac52dbe696111f31400796d81c3f5c87eeb086

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 4efe906..36f79ec 100644
--- a/debian/control
+++ b/debian/control
@@ -2,47 +2,42 @@ Source: elisa
 Section: sound
 Priority: optional
 Maintainer: Clive Johnston <clivejo at kubuntu.org>
-Build-Depends: baloo-kf5-dev,
-               cmake (>= 3.5),
-               debhelper (>= 9),
-               extra-cmake-modules,
-               kirigami2-dev,
-               libkf5config-dev,
-               libkf5configwidgets-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5declarative-dev,
-               libkf5doctools-dev,
-               libkf5filemetadata-dev,
-               libkf5kcmutils-dev,
-               libkf5qqc2desktopstyle-dev,
-               libqt5sql5-mysql,
-               libqt5sql5-sqlite,
-               libqt5svg5-dev,
-               libqt5websockets5-dev,
-               libkf5xmlgui-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-baloo-dev,
+               kf6-extra-cmake-modules,
+               kf6-kirigami2-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdeclarative-dev,
+               kf6-kdoctools-dev,
+               kf6-kfilemetadata-dev,
+               kf6-kkcmutils-dev,
+               kf6-kqqc2desktopstyle-dev,
                libvlc-dev,
                libvlccore-dev,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtmultimedia5-dev,
-               qtquickcontrols2-5-dev,
+               qt6-base-dev,
+               qt6-multimedia-dev,
+               qt6-declarative-dev,
+               qt6-svg-dev,
+               qt6-websockets-dev,
                xvfb
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 Homepage: https://cgit.kde.org/elisa.git
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/elisa
 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/elisa
 
 Package: elisa
 Architecture: any
-Depends: qml-module-org-kde-kcm,
-         qml-module-qt-labs-platform,
-         qml-module-qtqml-models2,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-controls2,
-         qml-module-qtquick-dialogs,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+Depends: qml6-module-org-kde-kcm,
+         qml6-module-qt-labs-platform,
+         qml6-module-qtqml-models2,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-dialogs,
+         qml6-module-qtquick-layouts,
+         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: A simple music player.
diff --git a/debian/rules b/debian/rules
index 7178bd9..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_TESTING=OFF
-
-# disable auto tests as they are failing on Test 11, upstream dev is aware and is fixing the problem
-override_dh_auto_test:
+	dh $@ --with kf6 --buildsystem kf6