From e87666fb5d7bbfa77f0c8964843aed81dbaf3b99 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 1 Nov 2020 09:55:07 -0500 Subject: [PATCH 01/10] Add missing changelog entry. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2c2a5d6..ac839b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.24-0ubuntu2) groovy; urgency=medium + + * Rebuild against new yaml-cpp. + + -- Gianfranco Costamagna Fri, 29 May 2020 14:19:25 +0200 + calamares (3.2.24-0ubuntu1) groovy; urgency=medium * New upstream release. From 5854256aced241f2fe268ec5501da0c7f3e15108 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 1 Nov 2020 10:06:34 -0500 Subject: [PATCH 02/10] Bump version for new upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac839b1..af0e3ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.32.1-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Sun, 01 Nov 2020 10:02:40 -0500 + calamares (3.2.24-0ubuntu2) groovy; urgency=medium * Rebuild against new yaml-cpp. From af65896a52b8fdd1fa31137b2e9b9adb2efe44c5 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 1 Nov 2020 10:26:17 -0500 Subject: [PATCH 03/10] Update copyright. --- debian/changelog | 1 + debian/copyright | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index af0e3ed..3290d76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.32.1-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Update copyright; remove files no longer shipped. -- Dan Simmons Sun, 01 Nov 2020 10:02:40 -0500 diff --git a/debian/copyright b/debian/copyright index 06e3b77..5a24fa9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -184,46 +184,6 @@ License: LGPL-2.1 On Debian systems, the complete text of the GNU Lesser General Public License can be found in /usr/share/common-licenses/LGPL-2.1. -Files: 3rdparty/waitingspinnerwidget.* -Copyright: 2012-2014 Alexander Turkin - 2014 by William Hallatt - 2015 by Jacob Dawid -License: Expat - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - the Software, and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Files: 3rdparty/kdsingleapplicationguard/* -Copyright: 2001-2010 Klaralvdalens Datakonsult AB -License: LGPL-2 - This library is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, version 2 of the License. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - . - The Debian packaging is Copyright (C) 2013, Kouhei Sutou and - is licensed under the LGPL-2, see `/usr/share/common-licenses/LGPL-2'. - Files: debian/* Copyright: 2014 Rohan Garg 2016-2017 Jonathan Carter From 5f0d2a65ce57e979d9aea542b6a7fe70697f9a9f Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 1 Nov 2020 12:37:09 -0500 Subject: [PATCH 04/10] Adjust lintian overrides. --- debian/changelog | 3 +++ debian/lintian-overrides | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3290d76..c0260bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ calamares (3.2.32.1-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update copyright; remove files no longer shipped. + * Adjust lintian-overrides. + - Fix spelling mistake. + - Remove false-positive spelling mistake and add a new one. -- Dan Simmons Sun, 01 Nov 2020 10:02:40 -0500 diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 236c1de..4e10b33 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,4 +1,4 @@ -# These are hooks that is incorperated in initramfs and does not need to be executable by itself. +# These are hooks that is incorporated in initramfs and does not need to be executable by itself. calamares: script-not-executable # Private libraries, so no -dev packages or symbol files @@ -10,4 +10,4 @@ calamares: package-name-doesnt-match-sonames 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 +calamares: spelling-error-in-binary usr/bin/calamares yUR your From b72e9898b81b99ebd7b7aae2e01e89eb32bed8fa Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 1 Nov 2020 14:35:39 -0500 Subject: [PATCH 05/10] Upload to Hirsute. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0260bb..0d1bda4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calamares (3.2.32.1-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.32.1-0ubuntu1) hirsute; urgency=medium * New upstream release. * Update copyright; remove files no longer shipped. @@ -6,7 +6,7 @@ calamares (3.2.32.1-0ubuntu1) UNRELEASED; urgency=medium - Fix spelling mistake. - Remove false-positive spelling mistake and add a new one. - -- Dan Simmons Sun, 01 Nov 2020 10:02:40 -0500 + -- Dan Simmons Sun, 01 Nov 2020 13:46:32 -0500 calamares (3.2.24-0ubuntu2) groovy; urgency=medium From 552c73caafc70c47e4af380dea04da51c07ea780 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 6 Dec 2020 15:32:18 -0500 Subject: [PATCH 06/10] Add missing changelog. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d1bda4..fb245f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.32.1-0ubuntu2) hirsute; urgency=medium + + * No-change rebuild to build with python3.9 as default. + + -- Matthias Klose Thu, 19 Nov 2020 20:18:01 +0100 + calamares (3.2.32.1-0ubuntu1) hirsute; urgency=medium * New upstream release. From 752d3a4302cd725b26d255c2fb647afb2f57db30 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 6 Dec 2020 16:06:51 -0500 Subject: [PATCH 07/10] Bump version for new upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fb245f8..fb55360 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.35-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Sun, 06 Dec 2020 16:05:43 -0500 + calamares (3.2.32.1-0ubuntu2) hirsute; urgency=medium * No-change rebuild to build with python3.9 as default. From db78f077fa3536096cab2dc80d18d987398ce4b5 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 6 Dec 2020 16:11:24 -0500 Subject: [PATCH 08/10] Add DEB_BUILD_MAINT_OPTIONS to d/rules. --- debian/changelog | 2 ++ debian/rules | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index fb55360..a027a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ calamares (3.2.35-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Add DEB_BUILD_MAINT_OPTIONS to debian/rules to make build paths + reproducible. -- Dan Simmons Sun, 06 Dec 2020 16:05:43 -0500 diff --git a/debian/rules b/debian/rules index c255054..e773fd9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # Hardening options, see: https://wiki.debian.org/Hardening export DEB_BUILD_MAINT_OPTIONS=hardening=+all +# Help make build paths reproducible. +export DEB_BUILD_MAINT_OPTIONS=buildinfo+path + %: dh $@ --with kf5 From 39103b73ae13ec9ee1f6eea4e1d84d451601e75d Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 6 Dec 2020 18:25:43 -0500 Subject: [PATCH 09/10] Adjust lintian-overrides for false-spelling and false alarm. --- debian/changelog | 2 ++ debian/lintian-overrides | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a027a8b..8ced41a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ calamares (3.2.35-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Add DEB_BUILD_MAINT_OPTIONS to debian/rules to make build paths reproducible. + * Remove false-positive spelling and add false alarm in lintian- + overrides. -- Dan Simmons Sun, 06 Dec 2020 16:05:43 -0500 diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 4e10b33..ce6edd2 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -9,5 +9,5 @@ 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/bin/calamares yUR your +# False alarm +calamares: hardening-no-bindnow From 5307380c30fbbad22e2456ee52600490eab2d1b3 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 6 Dec 2020 18:26:48 -0500 Subject: [PATCH 10/10] Upload to hirsute. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ced41a..96adbbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calamares (3.2.35-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.35-0ubuntu1) hirsute; urgency=medium * New upstream release. * Add DEB_BUILD_MAINT_OPTIONS to debian/rules to make build paths @@ -6,7 +6,7 @@ calamares (3.2.35-0ubuntu1) UNRELEASED; urgency=medium * Remove false-positive spelling and add false alarm in lintian- overrides. - -- Dan Simmons Sun, 06 Dec 2020 16:05:43 -0500 + -- Dan Simmons Sun, 06 Dec 2020 18:26:22 -0500 calamares (3.2.32.1-0ubuntu2) hirsute; urgency=medium