[neon/extras/calamares/Neon/unstable] debian: Revert "back on kf5 for now"

[Carlos De Maine]

Git commit 67eaa525410dd02c244979abdf41a674084225c5 by Carlos De Maine.
Committed on 18/12/2023 at 05:17.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "back on kf5 for now"

This reverts commit 28d021007f5d8e45793c8f72b8654a6f4b0b1ece.

M  +48   -23   debian/control
M  +2    -2    debian/rules

https://invent.kde.org/neon/extras/calamares/-/commit/67eaa525410dd02c244979abdf41a674084225c5

diff --git a/debian/control b/debian/control
index 8d4ad84..d53ef5a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,22 +10,22 @@ Build-Depends: cmake,
                libatasmart-dev,
                libboost-python-dev,
                libicu-dev,
-               libkf5extra-cmake-modules,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5dbusaddons-dev,
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5kio-dev,
-               libkf5package-dev,
-               libkf5parts-dev,
-               libkf5service-dev,
-               libkf5solid-dev,
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kpackage-dev,
+               kf6-kparts-dev,
+               kf6-kservice-dev,
+               kf6-solid-dev,
                libkpmcore-dev,
                libparted-dev,
                libplasma-dev,
-               libpolkit-qt5-1-dev,
+               libpolkit-qt6-1-dev,
                libpwquality-dev,
                libyaml-cpp-dev,
                os-prober,
@@ -34,12 +34,12 @@ Build-Depends: cmake,
                pkexec,
                python3-all-dev,
                python3-jsonschema,
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtlocation5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               qtwebengine5-dev
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-location-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
+               qt6-webengine-dev,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/calamares/calamares
@@ -49,10 +49,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/calamares.git
 Package: calamares
 Architecture: linux-any
 Depends: os-prober,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick-privatewidgets,
-         qml-module-qtquick-window2,
-         qml-module-qtquick2,
+         qt6-declarative,
          rsync,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -68,3 +65,31 @@ Description: distribution-independent installer framework
  You will likely want to provide your own config files to match
  your distribution, reading the Calamares documentation will guide
  you through that process.
+
+Package: calamares-dev
+Architecture: linux-any
+Depends: libyaml-cpp-dev,
+         os-prober,
+         qt6-base-dev,
+         qt6-declarative-dev,
+         qt6-location-dev,
+         qt6-svg-dev,
+         qt6-tools-dev,
+         qt6-webengine-dev,
+         rsync,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: btrfs-progs, grub-efi-amd64-bin, grub-pc, konsole, squashfs-tools
+Description: distribution-independent installer framework - development files
+ Calamares is a distribution-independent installer framework.
+ .
+ It provides a graphical installer that can be used with nearly
+ any distribution. This package is suitable for live media on
+ Debian-based systems, and won't be of any particular use on
+ an already installed system.
+ .
+ You will likely want to provide your own config files to match
+ your distribution, reading the Calamares documentation will guide
+ you through that process.
+ .
+ This package contains the development files.
diff --git a/debian/rules b/debian/rules
index 501aaa3..bbdf6ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 #export DEB_BUILD_OPTIONS=buildinfo=+path
 
 %:
-	dh $@ --with kf6 --buildsystem kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DWITH_PYTHONQT=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=OFF
+	dh_auto_configure -- -DWITH_PYTHONQT=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp