From a43cb567adf00093982903705eaafef4aca108f2 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Mon, 17 Jun 2019 19:42:08 -0700 Subject: [PATCH] Package for new upstream release. Summary: Remove patches applied in upstream code. Bump debhelper version. Run wrap-and-sort. Test Plan: Test installation in eoan. Reviewers: wxl, tsimonq2 Reviewed By: wxl Differential Revision: https://phab.lubuntu.me/D10 --- debian/changelog | 13 +++++++ debian/control | 2 +- debian/patches/avoid-heap-wrangling.patch | 38 ------------------- .../patches/drop-reparenting-trickery.patch | 22 ----------- debian/patches/series | 4 -- debian/patches/set-firmware-type.patch | 19 ---------- debian/patches/update-buttons.patch | 16 -------- 7 files changed, 14 insertions(+), 100 deletions(-) delete mode 100644 debian/patches/avoid-heap-wrangling.patch delete mode 100644 debian/patches/drop-reparenting-trickery.patch delete mode 100644 debian/patches/set-firmware-type.patch delete mode 100644 debian/patches/update-buttons.patch diff --git a/debian/changelog b/debian/changelog index 793d72d..b40a1f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +calamares (3.2.7-0ubuntu1) eoan; urgency=medium + + * New upstream release. + * Remove patches applied in upstream code. + - Remove drop re-parenting trickery patch. + - Remove avoid heap-wrangling the CreatePartitionDialog patch. + - Remove ensure the firmware type is set in the global configuration patch. + - Remove restore button updates in partition page patch. + * Bump debhelper version to >= 12. + * Run wrap-and-sort. + + -- Dan Simmons Mon, 27 May 2019 19:51:59 -0400 + calamares (3.2.4-0ubuntu3) disco; urgency=medium * Cherry-pick several beneficial upstream patches: diff --git a/debian/control b/debian/control index 348d262..f468097 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Lubuntu Developers XSBC-Original-Maintainer: Jonathan Carter Build-Depends: cmake, cryptsetup, - debhelper (>= 11), + debhelper (>= 12), extra-cmake-modules, gettext, libatasmart-dev, diff --git a/debian/patches/avoid-heap-wrangling.patch b/debian/patches/avoid-heap-wrangling.patch deleted file mode 100644 index f8f3ee3..0000000 --- a/debian/patches/avoid-heap-wrangling.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: [partition] Avoid heap-wrangling - The CreatePartitionDialog doesn't need to be on the heap, it's modal here. - Avoid QPointer weirdness as well. -Author: Adriaan de Groot -Origin: upstream -Applied-Upstream: commit:b4cefff975138e621d9a9437891c9d1b09616b74 -Last-Update: 2019-04-11 ---- a/src/modules/partition/gui/PartitionPage.cpp -+++ b/src/modules/partition/gui/PartitionPage.cpp -@@ -376,18 +376,18 @@ PartitionPage::onCreateClicked() - if ( !checkCanCreate( model->device() ) ) - return; - -- QPointer< CreatePartitionDialog > dlg = new CreatePartitionDialog( model->device(), -- partition->parent(), -- nullptr, -- getCurrentUsedMountpoints(), -- this ); -- dlg->initFromFreeSpace( partition ); -- if ( dlg->exec() == QDialog::Accepted ) -+ CreatePartitionDialog dlg( -+ model->device(), -+ partition->parent(), -+ nullptr, -+ getCurrentUsedMountpoints(), -+ this ); -+ dlg.initFromFreeSpace( partition ); -+ if ( dlg.exec() == QDialog::Accepted ) - { -- Partition* newPart = dlg->createPartition(); -- m_core->createPartition( model->device(), newPart, dlg->newFlags() ); -+ Partition* newPart = dlg.createPartition(); -+ m_core->createPartition( model->device(), newPart, dlg.newFlags() ); - } -- delete dlg; - } - - void diff --git a/debian/patches/drop-reparenting-trickery.patch b/debian/patches/drop-reparenting-trickery.patch deleted file mode 100644 index 28497e4..0000000 --- a/debian/patches/drop-reparenting-trickery.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: [partition] Drop some re-parenting trickery - Can't re-parent across threads easily. If device is made by - immutableDeviceCopy(), then it's still owned by the PartitionCoreModule; - giving it away to the widget is not a good idea. -Author: Adriaan de Groot -Origin: upstream -Applied-Upstream: commit:2092ec3c9a0a37553fd061f423df9d29fe55ab80 -Last-Update: 2019-04-11 ---- a/src/modules/partition/gui/ChoicePage.cpp -+++ b/src/modules/partition/gui/ChoicePage.cpp -@@ -882,11 +882,6 @@ ChoicePage::updateDeviceStatePreview() - PartitionModel* model = new PartitionModel( m_beforePartitionBarsView ); - model->init( deviceBefore, m_core->osproberEntries() ); - -- // The QObject parents tree is meaningful for memory management here, -- // see qDeleteAll above. -- deviceBefore->setParent( model ); // Can't reparent across threads -- model->setParent( m_beforePartitionBarsView ); -- - m_beforePartitionBarsView->setModel( model ); - m_beforePartitionLabelsView->setModel( model ); - diff --git a/debian/patches/series b/debian/patches/series index 38d0c6b..683ca99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,2 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch -update-buttons.patch -set-firmware-type.patch -avoid-heap-wrangling.patch -drop-reparenting-trickery.patch diff --git a/debian/patches/set-firmware-type.patch b/debian/patches/set-firmware-type.patch deleted file mode 100644 index 73d1a7c..0000000 --- a/debian/patches/set-firmware-type.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: [partition] Set firmware type -Author: Adriaan de Groot -Origin: upstream -Applied-Upstream: commit:105f9c48617b390743aefe2e612d1761a420a7fc -Last-Update: 2019-04-11 ---- a/src/modules/partition/gui/PartitionViewStep.cpp -+++ b/src/modules/partition/gui/PartitionViewStep.cpp -@@ -553,6 +553,11 @@ PartitionViewStep::setConfigurationMap( - efiSP = QStringLiteral( "/boot/efi" ); - gs->insert( "efiSystemPartition", efiSP ); - -+ // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. -+ QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) ); -+ cDebug() << "Setting firmwareType to" << firmwareType; -+ gs->insert( "firmwareType", firmwareType ); -+ - // SWAP SETTINGS - // - // This is a bit convoluted because there's legacy settings to handle as well diff --git a/debian/patches/update-buttons.patch b/debian/patches/update-buttons.patch deleted file mode 100644 index 6de2bd5..0000000 --- a/debian/patches/update-buttons.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Restore button updates in partition module -Author: Adriaan de Groot -Bug: https://github.com/calamares/calamares/issues/1097 -Applied-Upstream: https://github.com/calamares/calamares/commit/2b149fb944da8d975c05d562ab55adaa9dec25bb -Last-Update: 2019-04-08 ---- a/src/modules/partition/gui/PartitionPage.cpp -+++ b/src/modules/partition/gui/PartitionPage.cpp -@@ -581,7 +581,7 @@ void - PartitionPage::onPartitionModelReset() - { - m_ui->partitionTreeView->expandAll(); -- // updateButtons(); -+ updateButtons(); - updateBootLoaderIndex(); - } -