From d6c3d46eff56b35067900fcb7bf03396b5945e4b Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 15 Oct 2024 23:02:55 -0500 Subject: [PATCH] New upstream release, port to Qt 6 --- debian/changelog | 2 +- debian/control | 62 ++++++++++++++++++++++++------------------------ debian/copyright | 4 +--- debian/rules | 4 ++-- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ed11ad..cbf710a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calamares (3.3.9-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.3.9-0ubuntu1) plucky; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index f43a5bc..764f7d8 100644 --- a/debian/control +++ b/debian/control @@ -6,43 +6,43 @@ XSBC-Original-Maintainer: Jonathan Carter Build-Depends: cmake, cryptsetup , debhelper-compat (= 13), - extra-cmake-modules, gettext, - libappstreamqt5-dev (>= 1.0.0~), - libkf5config-dev, - libkf5coreaddons-dev, - libkf5crash-dev, - libkf5i18n-dev, - libkf5iconthemes-dev, - libkf5kio-dev, - libkf5parts-dev, - libkf5plasma-dev, - libkf5service-dev, - libkf5solid-dev, - libkpmcore-dev, + libappstreamqt-dev, + libatasmart-dev, + libboost-python-dev, + libicu-dev, + extra-cmake-modules, + libkf6config-dev, + libkf6coreaddons-dev, + libkf6crash-dev, + libkf6dbusaddons-dev, + libkf6i18n-dev, + libkf6iconthemes-dev, + libkf6kio-dev, + libkf6package-dev, + libkf6parts-dev, + libkf6service-dev, + libkf6solid-dev, + libkpmcore-dev (>= 24.08), libparted-dev, - libpolkit-qt5-1-dev, + libplasma-dev, + libpolkit-qt6-1-dev, libpwquality-dev, - libqt5svg5-dev, - libqt5webkit5-dev, libyaml-cpp-dev, - os-prober , - pkg-config, + os-prober, + pkgconf, pkg-kde-tools, - polkitd, - python3-dev, - python3-jsonschema, + pkexec, + python3-all-dev, python3-yaml, - 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 -Standards-Version: 4.6.2 + python3-jsonschema, + qt6-base-dev, + qt6-declarative-dev, + qt6-location-dev, + qt6-svg-dev, + qt6-tools-dev, + qt6-webengine-dev +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: https://github.com/calamares/calamares Vcs-Browser: https://git.lubuntu.me/Lubuntu/calamares-packaging/ diff --git a/debian/copyright b/debian/copyright index 06b2409..3bfdb6a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -71,7 +71,6 @@ Files: AUTHORS data/config-appimage/settings.conf data/config-appimage/modules/* data/example-root/* - lang/calamares_i18n.qrc.in src/libcalamares/CalamaresVersion.h.in src/libcalamares/locale/CountryData_p.cpp src/libcalamares/CalamaresVersionX.h.in @@ -230,7 +229,7 @@ Copyright: 2014-2016 Teo Mrnjavac 2017-2023 Adriaan de Groot License: BSD-2-Clause -Files: 3rdparty/kdsingleapplicationguard/* +Files: 3rdparty/kdsingleapplication/* Copyright: 2019-2021 Klaralvdalens Datakonsult AB. License: MIT @@ -267,7 +266,6 @@ Copyright: 2014 Uri Herrera and others License: LGPL-3+ Files: src/modules/finishedq/seedling.svg - src/modules/localeq/img/chevron-left-solid.svg Copyright: 2020-2021 FontAwesome License: CC-BY-4.0 diff --git a/debian/rules b/debian/rules index a261dfd..84b82be 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all export DEB_BUILD_MAINT_OPTIONS=buildinfo=+path %: - dh $@ --with kf5 + dh $@ --with kf6 --buildsystem kf6 override_dh_auto_configure: - dh_auto_configure -- -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON + dh_auto_configure -- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON # Some test don't work well, we don't need to run them at package build time. override_dh_auto_test: