From fa76c42d25024e26f2fb3eafd1dd4f485b849959 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 25 May 2022 05:26:27 -0500 Subject: [PATCH] Sync with archive. --- debian/changelog | 469 +++++++++++++++++++++++++++++++++++++++ debian/control | 12 +- debian/copyright | 70 +++--- debian/lintian-overrides | 3 - debian/rules | 4 +- debian/watch | 2 +- 6 files changed, 513 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 871f39d..097ee8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,150 @@ +calamares (3.2.58-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Refresh desktop patch to follow upstream changes. + - install apport hook. + - include additional copyright notice for debian/ + - use sudo instead of pkexec; patch dropped by Debian, but pkexec is not + compatible with Wayland. + + -- Steve Langasek Thu, 19 May 2022 09:32:08 -0700 + +calamares (3.2.58-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.6.1 + + -- Jonathan Carter Wed, 18 May 2022 17:37:43 +0200 + +calamares (3.2.57-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Refresh desktop patch to follow upstream changes. + - install apport hook. + - include additional copyright notice for debian/ + - use sudo instead of pkexec; patch dropped by Debian, but pkexec is not + compatible with Wayland. + + -- Steve Langasek Mon, 16 May 2022 11:25:14 -0700 + +calamares (3.2.57-1) unstable; urgency=medium + + * New upstream release + - Support for unencrypted /boot partition (Closes: #996007) + + -- Jonathan Carter Mon, 09 May 2022 10:18:18 +0200 + +calamares (3.2.56-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 25 Apr 2022 12:45:26 +0200 + +calamares (3.2.55-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 18 Apr 2022 11:21:10 +0200 + +calamares (3.2.54-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 29 Mar 2022 11:17:53 +0200 + +calamares (3.2.53-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Sat, 05 Mar 2022 18:03:59 +0200 + +calamares (3.2.52-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 01 Mar 2022 08:52:11 +0200 + +calamares (3.2.51-1) unstable; urgency=medium + + * New upstream rlease + + -- Jonathan Carter Tue, 15 Feb 2022 11:24:55 +0200 + +calamares (3.2.50-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Thu, 20 Jan 2022 11:47:53 +0200 + +calamares (3.2.49.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 03 Jan 2022 11:18:15 +0200 + +calamares (3.2.48-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 06 Dec 2021 10:50:25 +0200 + +calamares (3.2.47-1) unstable; urgency=medium + + [ Debian Janitor ] + * Trim trailing whitespace. + * debian/copyright: use spaces rather than tabs to start continuation lines. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + [ Jonathan Carter ] + * New upstream release + + -- Jonathan Carter Wed, 01 Dec 2021 21:49:49 +0200 + +calamares (3.2.44.3-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Wed, 06 Oct 2021 12:53:21 +0200 + +calamares (3.2.44.2-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 28 Sep 2021 13:23:34 +0200 + +calamares (3.2.43-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Fri, 17 Sep 2021 13:46:22 +0200 + +calamares (3.2.42-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.6.0 + + -- Jonathan Carter Thu, 09 Sep 2021 11:07:34 +0200 + +calamares (3.2.41.1-1) unstable; urgency=medium + + * New upstream release + * Remove lintian-override about pk-exec + + -- Jonathan Carter Wed, 01 Sep 2021 13:47:15 +0200 + +calamares (3.2.41.1-0ubuntu5) kinetic; urgency=medium + + * No-change rebuild against libkpmcore12 + + -- Steve Langasek Tue, 03 May 2022 02:40:43 +0000 + +calamares (3.2.41.1-0ubuntu4) jammy; urgency=medium + + * No-change rebuild against kpmcore 21.12.3 + + -- Erich Eickmeyer Thu, 31 Mar 2022 12:55:23 -0700 + calamares (3.2.41.1-0ubuntu3) jammy; urgency=medium * No-change rebuild with Python 3.10 as default version @@ -17,6 +164,18 @@ calamares (3.2.41.1-0ubuntu1) impish; urgency=medium -- Dan Simmons Sat, 07 Aug 2021 15:08:35 -0400 +calamares (3.2.39.3-1) experimental; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 29 Jun 2021 13:03:41 +0200 + +calamares (3.2.39.2-1) experimental; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 06 Apr 2021 14:22:19 +0200 + calamares (3.2.37-0ubuntu3) impish; urgency=medium * For now build for arch any. @@ -37,6 +196,30 @@ calamares (3.2.37-0ubuntu1) hirsute; urgency=medium -- Dan Simmons Sun, 28 Feb 2021 14:01:46 -0500 +calamares (3.2.36-1) unstable; urgency=medium + + [ Helmut Grohne ] + + * Reduce Build-Depends: (Closes: #983052) + + Annotate test dependencies cryptsetup, os-prober and policykit-1 with + profile . + + Drop unused libatasmart-dev. + + [ Jonathan Carter ] + + * New upstream release + * Update standards version to 4.5.1 + * Update copyright years and fix indentation + * Replace DEB_BUILD_OPTIONS with DEB_BUILD_MAINT_OPTIONS + + -- Jonathan Carter Wed, 10 Feb 2021 21:04:17 +0200 + +calamares (3.2.35.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 08 Dec 2020 16:22:17 +0200 + calamares (3.2.35-0ubuntu2) hirsute; urgency=medium * No-change rebuild for boost soname change. @@ -53,6 +236,33 @@ calamares (3.2.35-0ubuntu1) hirsute; urgency=medium -- Dan Simmons Sun, 06 Dec 2020 18:26:22 -0500 +calamares (3.2.33-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 10 Nov 2020 13:59:04 +0200 + +calamares (3.2.32.1-3) unstable; urgency=medium + + * No changes version bump + + -- Jonathan Carter Wed, 21 Oct 2020 09:28:26 +0200 + +calamares (3.2.32.1-2) unstable; urgency=medium + + * Small changes upload for kpmcore ABI bump (to version 10) + * Replace DEB_BUILD_OPTIONS with DEB_BUILD_MAINT_OPTIONS in + debian/rules + * Use secure copyright format URI + + -- Jonathan Carter Sun, 18 Oct 2020 18:31:41 +0200 + +calamares (3.2.32.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Sat, 17 Oct 2020 17:55:22 +0200 + calamares (3.2.32.1-0ubuntu2) hirsute; urgency=medium * No-change rebuild to build with python3.9 as default. @@ -69,6 +279,75 @@ calamares (3.2.32.1-0ubuntu1) hirsute; urgency=medium -- Dan Simmons Sun, 01 Nov 2020 13:46:32 -0500 +calamares (3.2.32-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Fri, 16 Oct 2020 17:56:48 +0200 + +calamares (3.2.31-2) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Wed, 07 Oct 2020 19:26:25 +0200 + +calamares (3.2.30-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 07 Sep 2020 22:25:17 +0200 + +calamares (3.2.28.3-2) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Wed, 19 Aug 2020 14:13:37 +0200 + +calamares (3.2.28.2-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Fri, 14 Aug 2020 11:09:21 +0200 + +calamares (3.2.28.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 11 Aug 2020 11:48:45 +0200 + +calamares (3.2.27-1) unstable; urgency=medium + + * New upstream release + * Remove lintian false-positive spelling warning + (no longer needed) + * debian/rules: + - Export buildinfo path to make .buildinfo files reproducible + * Remove files no longer shipped from debian/copyright + + -- Jonathan Carter Wed, 15 Jul 2020 11:43:33 +0200 + +calamares (3.2.26.1-1) unstable; urgency=medium + + * New upstream release + * debian/lintian-overrides: + - Fix spelling mistake + - Replace spelling false-positive with a new one + + -- Jonathan Carter Tue, 30 Jun 2020 19:59:54 +0200 + +calamares (3.2.26-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Sun, 21 Jun 2020 14:29:12 +0200 + +calamares (3.2.24-1) unstable; urgency=medium + + * New upstream release + * Upgrade to debhelper-compat (= 13) + + -- Jonathan Carter Sat, 16 May 2020 11:16:17 +0200 + calamares (3.2.24-0ubuntu2) groovy; urgency=medium * Rebuild against new yaml-cpp. @@ -86,6 +365,35 @@ calamares (3.2.24-0ubuntu1) groovy; urgency=medium -- Dan Simmons Sun, 24 May 2020 13:52:22 -0400 +calamares (3.2.23-1) unstable; urgency=medium + + * New upstream release + * Add lintian override for spelling mistake false-positive + + -- Jonathan Carter Fri, 17 Apr 2020 14:04:57 +0200 + +calamares (3.2.22-1) unstable; urgency=medium + + * New upstream release + * Update copyright file + * Remove spelling error lintian override (no longer needed) + + -- Jonathan Carter Wed, 08 Apr 2020 17:45:39 +0200 + +calamares (3.2.21-1) unstable; urgency=medium + + * New upstream release + * Declare Rules-Requires-Root: no + * Override lintian spelling error false-positive + + -- Jonathan Carter Sat, 28 Mar 2020 13:25:17 +0200 + +calamares (3.2.20-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 02 Mar 2020 10:20:06 +0200 + calamares (3.2.20-0ubuntu1) focal; urgency=medium * New upstream release. @@ -94,6 +402,12 @@ calamares (3.2.20-0ubuntu1) focal; urgency=medium -- Dan Simmons Thu, 27 Feb 2020 17:59:28 -0500 +calamares (3.2.19.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 25 Feb 2020 08:47:28 +0200 + calamares (3.2.19.1-0ubuntu1) focal; urgency=medium * New upstream release. @@ -101,6 +415,12 @@ calamares (3.2.19.1-0ubuntu1) focal; urgency=medium -- Walter Lapchynski Mon, 24 Feb 2020 13:13:33 -0800 +calamares (3.2.19-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 24 Feb 2020 11:06:20 +0200 + calamares (3.2.19-0ubuntu1) focal; urgency=medium * New upstream release. @@ -108,6 +428,13 @@ calamares (3.2.19-0ubuntu1) focal; urgency=medium -- Dan Simmons Sat, 22 Feb 2020 08:16:53 -0500 +calamares (3.2.18-1) unstable; urgency=medium + + * New upstream release + * Update copyright years + + -- Jonathan Carter Fri, 07 Feb 2020 18:34:53 +0200 + calamares (3.2.18-0ubuntu1) focal; urgency=medium * New upstream release. @@ -120,6 +447,12 @@ calamares (3.2.18-0ubuntu1) focal; urgency=medium -- Dan Simmons Sat, 15 Feb 2020 23:30:04 -0500 +calamares (3.2.17.1-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 03 Dec 2019 15:22:58 +0200 + calamares (3.2.17.1-0ubuntu5) focal; urgency=medium * No-change rebuild for libkpmcore9. @@ -153,6 +486,33 @@ calamares (3.2.17.1-0ubuntu1) focal; urgency=medium -- Dan Simmons Tue, 03 Dec 2019 22:04:34 -0500 +calamares (3.2.17-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 02 Dec 2019 11:19:51 +0200 + +calamares (3.2.16-1) unstable; urgency=medium + + * New upstream release + + -- Jonathan Carter Tue, 12 Nov 2019 08:00:29 +0000 + +calamares (3.2.15-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.4.1 + + -- Jonathan Carter Mon, 14 Oct 2019 08:31:17 +0000 + +calamares (3.2.14-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.5.0 + * Override lintian false-positive + + -- Jonathan Carter Tue, 08 Oct 2019 20:33:58 +0200 + calamares (3.2.14-0ubuntu3) focal; urgency=medium * No-change rebuild against libkpmcore8. @@ -175,6 +535,23 @@ calamares (3.2.14-0ubuntu1) eoan; urgency=medium -- Dan Simmons Tue, 08 Oct 2019 18:55:30 -0400 +calamares (3.2.13-1) unstable; urgency=medium + + * New upstream release + * Add copyright information for appdata file + * Remove lintian false positive that no longer applies + + -- Jonathan Carter Mon, 09 Sep 2019 12:25:55 +0000 + +calamares (3.2.12-1) unstable; urgency=medium + + * New upstream release + * Add lintian override for spelling mistake for something that looks like + a string, but isn't + * Remove lintian override that's no longer needed + + -- Jonathan Carter Thu, 08 Aug 2019 08:52:16 +0000 + calamares (3.2.12-0ubuntu1) eoan; urgency=medium * New upstream release. @@ -183,6 +560,13 @@ calamares (3.2.12-0ubuntu1) eoan; urgency=medium -- Dan Simmons Sun, 11 Aug 2019 20:46:30 -0400 +calamares (3.2.11-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.4.0 + + -- Jonathan Carter Mon, 08 Jul 2019 09:01:46 +0000 + calamares (3.2.11-0ubuntu1) eoan; urgency=medium * New upstream release. @@ -193,6 +577,12 @@ calamares (3.2.11-0ubuntu1) eoan; urgency=medium -- Dan Simmons Fri, 12 Jul 2019 19:52:38 -0400 +calamares (3.2.7-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Jonathan Carter Mon, 29 Apr 2019 09:26:13 +0000 + calamares (3.2.7-0ubuntu1) eoan; urgency=medium * New upstream release. @@ -206,6 +596,38 @@ calamares (3.2.7-0ubuntu1) eoan; urgency=medium -- Dan Simmons Mon, 27 May 2019 19:51:59 -0400 +calamares (3.2.5-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Jonathan Carter Wed, 24 Apr 2019 12:19:56 +0200 + +calamares (3.2.4-4) unstable; urgency=medium + + * Update VCS location + * Revert nostrip deb option + + -- Jonathan Carter Mon, 25 Feb 2019 07:32:20 +0000 + +calamares (3.2.4-3) unstable; urgency=medium + + * Do not build against pythonqt (avoid buggy dep during freeze) + + -- Jonathan Carter Thu, 21 Feb 2019 08:45:45 +0000 + +calamares (3.2.4-2) unstable; urgency=medium + + * Add libkf5plasma-dev as build dependency (Closes: #922105) + + -- Jonathan Carter Fri, 15 Feb 2019 08:47:19 +0000 + +calamares (3.2.4-1) unstable; urgency=medium + + * New upstream release + * Update to debhelper-compat (=12) + + -- Jonathan Carter Wed, 13 Feb 2019 07:01:50 +0000 + calamares (3.2.4-0ubuntu3) disco; urgency=medium * Cherry-pick several beneficial upstream patches: @@ -233,6 +655,14 @@ calamares (3.2.4-0ubuntu1) disco; urgency=medium -- Dan Simmons Fri, 15 Feb 2019 18:26:56 -0500 +calamares (3.2.3-2) unstable; urgency=medium + + * Add libpwquality-dev to build-depends + * Remove patch to use sudo instead of pkexec + (pkexec seems to work fine now on all debian variants) + + -- Jonathan Carter Mon, 21 Jan 2019 11:58:37 +0200 + calamares (3.2.3-1ubuntu1) disco; urgency=medium * Merge from Debian Sid. Remaining changes: @@ -244,6 +674,44 @@ calamares (3.2.3-1ubuntu1) disco; urgency=medium -- Simon Quigley Sat, 12 Jan 2019 15:16:51 -0600 +calamares (3.2.3-1) unstable; urgency=medium + + * New upstream release + * Update copyright years + * Update standards version to 4.3.0 + + -- Jonathan Carter Thu, 10 Jan 2019 09:09:48 +0200 + +calamares (3.2.2-4) unstable; urgency=medium + + * Rebuild for latest pythonqt with Python 3.7 + + -- Jonathan Carter Mon, 10 Dec 2018 14:10:22 +0200 + +calamares (3.2.2-3) unstable; urgency=medium + + * Re-add lintian-overrides removed in error + + -- Jonathan Carter Tue, 27 Nov 2018 09:45:18 +0200 + +calamares (3.2.2-2) unstable; urgency=medium + + * Version bump (no changes) + + -- Jonathan Carter Thu, 22 Nov 2018 23:07:48 +0200 + +calamares (3.2.2-1) unstable; urgency=medium + + * New upstream release + * Update standards version to 4.2.1 + * debian/control: wrap-and-sort + * Remove 0002-Add-patch-to-compile-with-pythonQt.patch (fixed upstream) + * Remove 0003-remove-wrong-path.patch (no longer needed) + * Remove extra-license-file lintian override (no longer needed) + * Remove spelling error lintian override (no longer needed) + + -- Jonathan Carter Mon, 10 Sep 2018 09:12:14 +0200 + calamares (3.2.2-0ubuntu4) disco; urgency=medium * Add support for XDG directories, which lays the foundation for OEM @@ -417,3 +885,4 @@ calamares (3.1.3-1) unstable; urgency=low * Initial release (Closes: #842671) -- Jonathan Carter Tue, 18 Jul 2017 14:38:15 +0200 + diff --git a/debian/control b/debian/control index 696d304..e1f46b6 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,10 @@ Priority: optional Maintainer: Lubuntu Developers XSBC-Original-Maintainer: Jonathan Carter Build-Depends: cmake, - cryptsetup, + cryptsetup , debhelper-compat (= 13), extra-cmake-modules, gettext, - libatasmart-dev, libboost-python-dev, libkf5config-dev, libkf5coreaddons-dev, @@ -16,6 +15,7 @@ Build-Depends: cmake, libkf5iconthemes-dev, libkf5kio-dev, libkf5parts-dev, + libkf5plasma-dev, libkf5service-dev, libkf5solid-dev, libkpmcore-dev, @@ -25,10 +25,10 @@ Build-Depends: cmake, libqt5svg5-dev, libqt5webkit5-dev, libyaml-cpp-dev, - os-prober, + os-prober , pkg-config, pkg-kde-tools, - policykit-1, + policykit-1 , python3-dev, qml-module-qtquick-layouts, qml-module-qtquick-privatewidgets, @@ -38,7 +38,7 @@ Build-Depends: cmake, qtdeclarative5-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://github.com/calamares/calamares Vcs-Browser: https://phab.lubuntu.me/source/calamares/ @@ -47,7 +47,7 @@ XS-Debian-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde-extras/calamares XS-Debian-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde-extras/calamares.git Package: calamares -Architecture: any +Architecture: linux-any Depends: os-prober, ${misc:Depends}, ${shlibs:Depends} Recommends: btrfs-progs, squashfs-tools Description: distribution-independent installer framework diff --git a/debian/copyright b/debian/copyright index 5a24fa9..75b82e6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,49 +3,49 @@ Upstream-Name: calamares Source: https://github.com/calamares/calamares Files: * -Copyright: 2017-2020, Adriaan de Groot +Copyright: 2017-2021, Adriaan de Groot 2020, Camilo Higuita 2020, Anke Boersma 2017-2018, Alf Gaida 2017-2018, Gabriel Craciunescu - 2018-2020, Philip Müller + 2018, Philip Müller 2018, AlmAck 2018, Caio Carvalho - 2017, Kyle Robbertze - 2016, Artoo - 2016, Luca Giambonini - 2016, Lisa Vitolo + 2017, Kyle Robbertze + 2016, Artoo + 2016, Luca Giambonini + 2016, Lisa Vitolo 2016, David McKinney - 2016, Andrius Štikonas - 2015, Sacha Schutz - 2015, Anke Boersma - 2015, Alexandre Arnt - 2014-2016, Kevin Kofler + 2016, Andrius Štikonas + 2015, Sacha Schutz + 2015, Anke Boersma + 2015, Alexandre Arnt + 2014-2016, Kevin Kofler 2014-2016, Teo Mrnjavac - 2014-2017, Philip Müller + 2014-2017, Philip Müller 2014-2015, Rohan Garg - 2014, Schutz Sacha + 2014, Schutz Sacha 2014, Aurélien Gâteau - 2014, Pier Luigi Fiorini - 2014, Daniel Hillenbrand - 2014, Benjamin Vaudour - 2013, Kay Sievers - 2012, Digia Plc and/or its subsidiary(-ies) + 2014, Pier Luigi Fiorini + 2014, Daniel Hillenbrand + 2014, Benjamin Vaudour + 2013, Kay Sievers + 2012, Digia Plc and/or its subsidiary(-ies) 2011, Lennart Poettering - 2011, Nikita Krupen'ko - 2011, Kitware, Inc. - 2010-2012, Jeff Mitchell - 2010-2012, Christian Muehlhaeuser - 2010-2011, Leo Franchi - 2009, Sebastian Trueg, - 2008-2011, by Volker Lanz - 2007, Matthias Kretz i - 2007, Bernhard Loos - 2007, Free Software Foundation, Inc. - 2006, by Dominic Battre - 2006, by Martin Pool - 2006, Allen Winter, - 1999, Ian Zepp (icszepp@islc.net) + 2011, Nikita Krupen'ko + 2011, Kitware, Inc. + 2010-2012, Jeff Mitchell + 2010-2012, Christian Muehlhaeuser + 2010-2011, Leo Franchi + 2009, Sebastian Trueg, + 2008-2011, by Volker Lanz + 2007, Matthias Kretz i + 2007, Bernhard Loos + 2007, Free Software Foundation, Inc. + 2006, by Dominic Battre + 2006, by Martin Pool + 2006, Allen Winter, + 1999, Ian Zepp (icszepp@islc.net) License: GPL-3+ Files: io.calamares.calamares.appdata.xml @@ -174,7 +174,7 @@ License: CC0-1.0 Files: src/qml/calamares/slideshow/*qml Copyright: 2017, Adriaan de Groot 2016 The Qt Company Ltd - 2012 Digia Plc and/or its subsidiary(-ies) + 2012 Digia Plc and/or its subsidiary(-ies) License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -185,8 +185,8 @@ License: LGPL-2.1 License can be found in /usr/share/common-licenses/LGPL-2.1. Files: debian/* -Copyright: 2014 Rohan Garg - 2016-2017 Jonathan Carter +Copyright: 2016-2021 Jonathan Carter + 2014 Rohan Garg 2018-2020 Simon Quigley License: GPL-3+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index ce6edd2..30ed853 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -6,8 +6,5 @@ calamares: non-dev-pkg-with-shlib-symlink calamares: no-symbols-control-file 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 alarm calamares: hardening-no-bindnow diff --git a/debian/rules b/debian/rules index e773fd9..a8230de 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,8 @@ # 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 +# Help makes build paths reproducible +export DEB_BUILD_MAINT_OPTIONS=buildinfo=+path %: dh $@ --with kf5 diff --git a/debian/watch b/debian/watch index 66f4de2..64978b9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ -version=3 +version=4 opts="filenamemangle=s/(?:.*\/)?v?(\d[\d.]*)\.tar\.gz/calamares-$1.tar.gz/" \ https://github.com/calamares/calamares/tags (?:.*/)?v?(\d[\d.]*)\.tar\.gz