From 7163358a20e809918ceaaf19fcaa9c850823f0cb Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 12:55:18 -0400 Subject: [PATCH 1/7] Bump version for new upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 713af7a..aef1eca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 + calamares (3.2.20-0ubuntu1) focal; urgency=medium * New upstream release. From c50c98a01a9ca9312d971f62cbe0b1080d89780f Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:01:47 -0400 Subject: [PATCH 2/7] Update copyright file. --- debian/changelog | 1 + debian/copyright | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index aef1eca..d823a46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Update copyright file. -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 diff --git a/debian/copyright b/debian/copyright index a004f71..06e3b77 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,6 +4,8 @@ Source: https://github.com/calamares/calamares Files: * Copyright: 2017-2020, Adriaan de Groot + 2020, Camilo Higuita + 2020, Anke Boersma 2017-2018, Alf Gaida 2017-2018, Gabriel Craciunescu 2018-2020, Philip Müller From 4eafdd50d2d8b4db9f0c48a04e6e94936c8adbdf Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:08:30 -0400 Subject: [PATCH 3/7] Update debhelper-compat. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d823a46..15c0f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update copyright file. + * Update debhelper-compat (=13), no changes needed. -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 diff --git a/debian/control b/debian/control index bc56ad0..4d3e516 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Lubuntu Developers XSBC-Original-Maintainer: Jonathan Carter Build-Depends: cmake, cryptsetup, - debhelper-compat (= 12), + debhelper-compat (= 13), extra-cmake-modules, gettext, libatasmart-dev, From 2ff6aa38b12a638c1281a1d4e9c3606ad176cdba Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:18:44 -0400 Subject: [PATCH 4/7] Declare Rules-Requires-Root: no. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 15c0f29..7b64edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update copyright file. * Update debhelper-compat (=13), no changes needed. + * Declare Rules-Requires-Root: no -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 diff --git a/debian/control b/debian/control index 4d3e516..ac2d522 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,7 @@ Build-Depends: cmake, qttools5-dev, qttools5-dev-tools Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: https://github.com/calamares/calamares Vcs-Browser: https://phab.lubuntu.me/source/calamares/ Vcs-Git: https://phab.lubuntu.me/source/calamares.git From 6160b9b47f5aba5e4aa2f764266895b781f9fd3c Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:36:05 -0400 Subject: [PATCH 5/7] Add lintian override for spelling false-positive. --- debian/changelog | 1 + debian/lintian-overrides | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7b64edb..311ad5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * Update copyright file. * Update debhelper-compat (=13), no changes needed. * Declare Rules-Requires-Root: no + * Add lintian override for spelling mistake false-positive. -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 diff --git a/debian/lintian-overrides b/debian/lintian-overrides index c0a2cf1..236c1de 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -8,3 +8,6 @@ calamares: package-name-doesnt-match-sonames # Debian live media relies on sudo so this message isn't needed calamares: desktop-command-not-in-package usr/share/applications/calamares.desktop sudo + +# False positive +calamares: spelling-error-in-binary usr/lib/x86_64-linux-gnu/calamares/modules/locale/libcalamares_viewmodule_locale.so WHe When From 07f7ce829fbfcb39ad84683e78e0c8bed4bbc103 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:52:14 -0400 Subject: [PATCH 6/7] Update changelog. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 311ad5d..bafffed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Improved popup warning for ESP flag not set. (LP: #1871884) * Update copyright file. * Update debhelper-compat (=13), no changes needed. * Declare Rules-Requires-Root: no From 3bcb59807affa2bfb0e81e62efc00a0a60b24d64 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 24 May 2020 13:53:23 -0400 Subject: [PATCH 7/7] Upload to groovy. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bafffed..2c2a5d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.24-0ubuntu1) groovy; urgency=medium * New upstream release. * Improved popup warning for ESP flag not set. (LP: #1871884) @@ -7,7 +7,7 @@ calamares (3.2.24-0ubuntu1) UNRELEASED; urgency=medium * Declare Rules-Requires-Root: no * Add lintian override for spelling mistake false-positive. - -- Dan Simmons Sun, 24 May 2020 12:52:49 -0400 + -- Dan Simmons Sun, 24 May 2020 13:52:22 -0400 calamares (3.2.20-0ubuntu1) focal; urgency=medium