From 102a28922701b82501393dd5341d90cb47f79f65 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Tue, 30 Apr 2019 19:13:26 -0400 Subject: [PATCH] Remove patches applied in upstream code. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/update-buttons.patch | 16 ---------------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 debian/patches/update-buttons.patch diff --git a/debian/changelog b/debian/changelog index 199a8d7..252e24d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.7-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Remove button update patch that was applied upstream. -- Dan Simmons Tue, 30 Apr 2019 19:05:07 -0400 diff --git a/debian/patches/series b/debian/patches/series index 4cfd2cd..683ca99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch -update-buttons.patch 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(); - } -