New upstream release, port to Qt 6

debian/changelog

@@ -1,4 +1,4 @@
-calamares (3.3.9-0ubuntu1) UNRELEASED; urgency=medium
+calamares (3.3.9-0ubuntu1) plucky; urgency=medium
 
   * New upstream release.
 

debian/control

@@ -6,43 +6,43 @@ XSBC-Original-Maintainer: Jonathan Carter <jcc@debian.org>
 Build-Depends: cmake,
                cryptsetup <!nocheck>,
                debhelper-compat (= 13),
-               extra-cmake-modules,
                gettext,
-               libappstreamqt5-dev (>= 1.0.0~),
+               libappstreamqt-dev,
-               libkf5config-dev,
+               libatasmart-dev,
-               libkf5coreaddons-dev,
+               libboost-python-dev,
-               libkf5crash-dev,
+               libicu-dev,
-               libkf5i18n-dev,
+               extra-cmake-modules,
-               libkf5iconthemes-dev,
+               libkf6config-dev,
-               libkf5kio-dev,
+               libkf6coreaddons-dev,
-               libkf5parts-dev,
+               libkf6crash-dev,
-               libkf5plasma-dev,
+               libkf6dbusaddons-dev,
-               libkf5service-dev,
+               libkf6i18n-dev,
-               libkf5solid-dev,
+               libkf6iconthemes-dev,
-               libkpmcore-dev,
+               libkf6kio-dev,
+               libkf6package-dev,
+               libkf6parts-dev,
+               libkf6service-dev,
+               libkf6solid-dev,
+               libkpmcore-dev (>= 24.08),
                libparted-dev,
-               libpolkit-qt5-1-dev,
+               libplasma-dev,
+               libpolkit-qt6-1-dev,
                libpwquality-dev,
-               libqt5svg5-dev,
-               libqt5webkit5-dev,
                libyaml-cpp-dev,
-               os-prober <!nocheck>,
+               os-prober,
-               pkg-config,
+               pkgconf,
                pkg-kde-tools,
-               polkitd,
+               pkexec,
-               python3-dev,
+               python3-all-dev,
-               python3-jsonschema,
                python3-yaml,
-               qml-module-qtquick-layouts,
+               python3-jsonschema,
-               qml-module-qtquick-privatewidgets,
+               qt6-base-dev,
-               qml-module-qtquick-window2,
+               qt6-declarative-dev,
-               qml-module-qtquick2,
+               qt6-location-dev,
-               qtbase5-dev,
+               qt6-svg-dev,
-               qtdeclarative5-dev,
+               qt6-tools-dev,
-               qtlocation5-dev,
+               qt6-webengine-dev
-               qttools5-dev,
+Standards-Version: 4.7.0
-               qttools5-dev-tools
-Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/calamares/calamares
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/calamares-packaging/

debian/copyright

@@ -71,7 +71,6 @@ Files: AUTHORS
        data/config-appimage/settings.conf
        data/config-appimage/modules/*
        data/example-root/*
-       lang/calamares_i18n.qrc.in
        src/libcalamares/CalamaresVersion.h.in
        src/libcalamares/locale/CountryData_p.cpp
        src/libcalamares/CalamaresVersionX.h.in
@@ -230,7 +229,7 @@ Copyright: 2014-2016 Teo Mrnjavac <teo@kde.org>
            2017-2023 Adriaan de Groot <groot@kde.org>
 License: BSD-2-Clause
 
-Files: 3rdparty/kdsingleapplicationguard/*
+Files: 3rdparty/kdsingleapplication/*
 Copyright: 2019-2021 Klaralvdalens Datakonsult AB. <info@kdab.com>
 License: MIT
 
@@ -267,7 +266,6 @@ Copyright: 2014 Uri Herrera <uri_herrera@nitrux.in> and others
 License: LGPL-3+
 
 Files: src/modules/finishedq/seedling.svg
-       src/modules/localeq/img/chevron-left-solid.svg
 Copyright: 2020-2021 FontAwesome <hello@fontawesome.com>
 License: CC-BY-4.0
 

debian/rules

@@ -7,10 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export DEB_BUILD_MAINT_OPTIONS=buildinfo=+path
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON
+	dh_auto_configure -- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON
 
 # Some test don't work well, we don't need to run them at package build time.
 override_dh_auto_test: