From 4111b8a7dd3ca9cdfb8c864ac6e05ecd14945490 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 18 Feb 2025 01:29:17 -0600 Subject: [PATCH] Run wrap-and-sort. --- debian/changelog | 1 + debian/control | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57a125a..e1432dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ 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. + * Run wrap-and-sort. -- Simon Quigley Tue, 18 Feb 2025 00:28:25 -0600 diff --git a/debian/control b/debian/control index 45a1aae..5cc688e 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: devel Priority: optional Maintainer: Lubuntu Developers Uploaders: Simon Quigley -Build-Depends: calamares (>= 3.3.13-0ubuntu4), - cmake, - debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13), dh-sequence-qmldeps, + calamares (>= 3.3.13-0ubuntu4), + cmake, extra-cmake-modules, intltool, libkf6coreaddons-dev, @@ -26,8 +26,8 @@ Rules-Requires-Root: no Package: calamares-settings-kubuntu Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), - ${qml6:Depends}, - ${misc:Depends} + ${misc:Depends}, + ${qml6:Depends} Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor Description: Kubuntu Calamares Settings and Branding @@ -39,8 +39,8 @@ Description: Kubuntu Calamares Settings and Branding Package: calamares-settings-lubuntu Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), - ${qml6:Depends}, - ${misc:Depends} + ${misc:Depends}, + ${qml6:Depends} Recommends: lubuntu-installer-prompt Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor @@ -55,8 +55,8 @@ Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), qt6-style-kvantum, qt6-style-kvantum-themes, - ${qml6:Depends}, - ${misc:Depends} + ${misc:Depends}, + ${qml6:Depends} Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor Description: Ubuntu Unity Calamares Settings and Branding @@ -77,8 +77,8 @@ Depends: calamares (>= 3.3.13-0ubuntu4), snapd-seed-glue, squashfs-tools, sudo, - ${qml6:Depends}, ${misc:Depends}, + ${qml6:Depends}, ${shlibs:Depends} Description: Common Calamares Settings This package contains the common Calamares settings for all flavors.