[neon/extras/calamares/Neon/release] debian: back on kf5 for now

[Jonathan Esk-Riddell]

Git commit 28d021007f5d8e45793c8f72b8654a6f4b0b1ece by Jonathan Esk-Riddell.
Committed on 13/12/2023 at 12:03.
Pushed by jriddell into branch 'Neon/release'.

back on kf5 for now

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

https://invent.kde.org/neon/extras/calamares/-/commit/28d021007f5d8e45793c8f72b8654a6f4b0b1ece

diff --git a/debian/control b/debian/control
index d53ef5a..8d4ad84 100644
--- a/debian/control
+++ b/debian/control
@@ -10,22 +10,22 @@ Build-Depends: cmake,
                libatasmart-dev,
                libboost-python-dev,
                libicu-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,
+               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,
                libkpmcore-dev,
                libparted-dev,
                libplasma-dev,
-               libpolkit-qt6-1-dev,
+               libpolkit-qt5-1-dev,
                libpwquality-dev,
                libyaml-cpp-dev,
                os-prober,
@@ -34,12 +34,12 @@ Build-Depends: cmake,
                pkexec,
                python3-all-dev,
                python3-jsonschema,
-               qt6-base-dev,
-               qt6-declarative-dev,
-               qt6-location-dev,
-               qt6-svg-dev,
-               qt6-tools-dev,
-               qt6-webengine-dev,
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qtlocation5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               qtwebengine5-dev
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/calamares/calamares
@@ -49,7 +49,10 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/calamares.git
 Package: calamares
 Architecture: linux-any
 Depends: os-prober,
-         qt6-declarative,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick-privatewidgets,
+         qml-module-qtquick-window2,
+         qml-module-qtquick2,
          rsync,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -65,31 +68,3 @@ 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 bbdf6ce..501aaa3 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 kf6
+	dh $@ --with kf6 --buildsystem kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DWITH_PYTHONQT=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON
+	dh_auto_configure -- -DWITH_PYTHONQT=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=OFF
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp