[neon/extras/calamares/Neon/experimental] debian: kf6ify

[Carlos De Maine]

Git commit 0037ae5616ef56d1fe843c8aa0593e5b1c0bd9ce by Carlos De Maine.
Committed on 25/10/2023 at 01:28.
Pushed by carlosdem into branch 'Neon/experimental'.

kf6ify

C  +0    -0    debian/calamares-dev.install [from: debian/not-installed - 100% similarity]
M  +52   -33   debian/control
M  +1    -3    debian/not-installed
M  +2    -2    debian/rules

https://invent.kde.org/neon/extras/calamares/-/commit/0037ae5616ef56d1fe843c8aa0593e5b1c0bd9ce

diff --git a/debian/not-installed b/debian/calamares-dev.install
similarity index 100%
copy from debian/not-installed
copy to debian/calamares-dev.install
diff --git a/debian/control b/debian/control
index 86c690e..1cc03b2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,48 +4,43 @@ Priority: optional
 Maintainer: Jonathan Carter <jcc at debian.org>
 Build-Depends: cmake,
                cryptsetup,
-               debhelper-compat (= 12),
-               extra-cmake-modules,
+               debhelper-compat (= 13),
                gettext,
                libatasmart-dev,
                libboost-python-dev,
                libicu-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5dbusaddons-dev,
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5kio-dev,
-               libkf5package-dev,
-               libkf5parts-dev,
-               libkf5plasma-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-kplasma-dev,
+               kf6-kservice-dev,
+               kf6-solid-dev,
                libkpmcore-dev,
                libparted-dev,
-               libpolkit-qt5-1-dev,
+               libpolkit-qt6-1-dev,
                libpwquality-dev,
-               libqt5svg5-dev,
                libyaml-cpp-dev,
                os-prober,
                pkg-config,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                pkexec,
+               python3,
                python3-dev,
                python3-jsonschema,
-               python3,
-               qml-module-qtquick-layouts,
-               qml-module-qtquick-privatewidgets,
-               qml-module-qtquick-window2,
-               qml-module-qtquick2,
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtlocation5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               qtwebengine5-dev
-Standards-Version: 4.5.0
+               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
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/calamares
@@ -54,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}
@@ -73,3 +65,30 @@ 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: 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/not-installed b/debian/not-installed
index fe5498f..8b13789 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1 @@
-usr/lib/*/libcalamares*.so
-usr/include/*
-usr/lib/*/cmake
+
diff --git a/debian/rules b/debian/rules
index 6fdf7a4..318c8b2 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 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 -DWITH_PYBIND11=OFF
+	dh_auto_configure -- -DWITH_PYTHONQT=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON -DWITH_PYBIND11=OFF
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp