diff --git a/debian/changelog b/debian/changelog index a32486e..dd96d6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares (3.3.0~git20220620-0ubuntu1) kinetic; urgency=medium + + * New upstream snapshot. + * Add some additional build dependencies. + + -- Simon Quigley Tue, 21 Jun 2022 22:46:58 -0500 + calamares (3.3.0~git20220610-0ubuntu2) kinetic; urgency=medium * Fix UEFI installation bug diff --git a/debian/control b/debian/control index 7dedcc0..4e70665 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,11 @@ Build-Depends: cmake, debhelper-compat (= 13), extra-cmake-modules, gettext, + libappstreamqt-dev, libboost-python-dev, libkf5config-dev, libkf5coreaddons-dev, + libkf5crash-dev, libkf5i18n-dev, libkf5iconthemes-dev, libkf5kio-dev, @@ -36,8 +38,10 @@ Build-Depends: cmake, qml-module-qtquick2, qtbase5-dev, qtdeclarative5-dev, + qtlocation5-dev, qttools5-dev, - qttools5-dev-tools + qttools5-dev-tools, + qtwebengine5-dev Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://github.com/calamares/calamares diff --git a/debian/patches/series b/debian/patches/series index f4189f8..683ca99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch -uefi-bootloader-fix.patch diff --git a/debian/patches/uefi-bootloader-fix.patch b/debian/patches/uefi-bootloader-fix.patch deleted file mode 100644 index dedf41e..0000000 --- a/debian/patches/uefi-bootloader-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix UEFI installation bug - A previous change in Calamares 3.3.0 caused the UEFI partition to not be - populated when installing Lubuntu on a UEFI system. This patch reverts the - change, allowing UEFI installations to work again. -Author: Aaron Rainbolt -Origin: upstream -Bug: https://github.com/calamares/calamares/issues/1990 -Forwarded: not-needed -Applied-Upstream: https://github.com/calamares/calamares/pull/1991 -Last-Update: 2022-06-16 ---- a/src/modules/bootloader/main.py -+++ b/src/modules/bootloader/main.py -@@ -798,12 +798,8 @@ def run(): - - fw_type = libcalamares.globalstorage.value("firmwareType") - -- if libcalamares.globalstorage.value("bootLoader") is None: -- # Don't want a bootloader, but do log that this has an effect: -- if fw_type != "efi": -- libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) -- else: -- libcalamares.utils.warning( "EFI system, and no bootloader is set." ) -+ if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"): -+ libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) - return None - - partitions = libcalamares.globalstorage.value("partitions")