From fc7f5948481933d7470f5ab9cc9056a72dbf0886 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 18 Feb 2025 01:28:52 -0600 Subject: [PATCH] Add dh-sequence-qmldeps and ${qml6:Depends} to ensure all QML 6 runtime dependencies are properly picked up. --- debian/changelog | 7 +++++++ debian/control | 7 +++++-- debian/qmldeps.overrides | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 debian/qmldeps.overrides diff --git a/debian/changelog b/debian/changelog index 87df0fa..57a125a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-ubuntu (1:25.04.14) UNRELEASED; urgency=medium + + * Add dh-sequence-qmldeps and ${qml6:Depends} to ensure all QML 6 runtime + dependencies are properly picked up. + + -- Simon Quigley Tue, 18 Feb 2025 00:28:25 -0600 + calamares-settings-ubuntu (1:25.04.13) plucky; urgency=medium * [users] Set allowWeakPasswords and allowWeakPasswordsDefault to false for diff --git a/debian/control b/debian/control index 3a91d9a..45a1aae 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Simon Quigley Build-Depends: calamares (>= 3.3.13-0ubuntu4), cmake, debhelper-compat (= 13), + dh-sequence-qmldeps, extra-cmake-modules, intltool, libkf6coreaddons-dev, @@ -25,6 +26,7 @@ Rules-Requires-Root: no Package: calamares-settings-kubuntu Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), + ${qml6:Depends}, ${misc:Depends} Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor @@ -37,6 +39,7 @@ Description: Kubuntu Calamares Settings and Branding Package: calamares-settings-lubuntu Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), + ${qml6:Depends}, ${misc:Depends} Recommends: lubuntu-installer-prompt Conflicts: calamares-settings-ubuntu-flavor @@ -52,6 +55,7 @@ Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), qt6-style-kvantum, qt6-style-kvantum-themes, + ${qml6:Depends}, ${misc:Depends} Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor @@ -70,11 +74,10 @@ Depends: calamares (>= 3.3.13-0ubuntu4), keyutils, python3, python3-distro, - qml6-module-qtquick, - qml6-module-qtquick-window, snapd-seed-glue, squashfs-tools, sudo, + ${qml6:Depends}, ${misc:Depends}, ${shlibs:Depends} Description: Common Calamares Settings diff --git a/debian/qmldeps.overrides b/debian/qmldeps.overrides new file mode 100644 index 0000000..9022110 --- /dev/null +++ b/debian/qmldeps.overrides @@ -0,0 +1 @@ +calamares.slideshow calamares