From 3d796470f36763052d6b79507255de6d3b514407 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Thu, 18 Jul 2019 16:02:42 -0700 Subject: [PATCH 01/20] Package calamares for new upstream release. Summary: Package new upstream release version. T87 (LP: #1835095) Test Plan: Test calamares install. Test FDE for proper handling of files and permissions. Reviewers: teward, wxl, tsimonq2 Reviewed By: teward, wxl, tsimonq2 Differential Revision: https://phab.lubuntu.me/D21 --- debian/changelog | 10 ++++++++++ debian/control | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b40a1f0..efde3f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +calamares (3.2.11-0ubuntu1) eoan; urgency=medium + + * New upstream release. + * Proper handling of files and permissions with FDE: (LP: #1835095) + - CVE-2019-13178 Set proper umask for luks crypto_keyfile. + - CVE-2019-13179 Set proper umask for initramfs. + * Bump Standards-version to 4.4.0, no changes needed. + + -- Dan Simmons Fri, 12 Jul 2019 19:52:38 -0400 + calamares (3.2.7-0ubuntu1) eoan; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index f468097..47db7b6 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Build-Depends: cmake, qtdeclarative5-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Homepage: https://github.com/calamares/calamares Vcs-Browser: https://phab.lubuntu.me/source/calamares/ Vcs-Git: https://phab.lubuntu.me/source/calamares.git From e691acdf2580382f5321b039523944b0720a18ba Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 11 Aug 2019 22:12:22 -0400 Subject: [PATCH 02/20] Package Calamares for new upstream release. Summary: Package Calamares for new upstream release 3.2.12 Bump debian/compat to 12. Adjust desktop patch to not show in LXQt. T108 Test Plan: Test Calamares install. Verify only one desktop file appears in menu. Reviewers: wxl, tsimonq2 Reviewed By: wxl, tsimonq2 Differential Revision: https://phab.lubuntu.me/D29 --- debian/changelog | 8 ++++++++ debian/compat | 2 +- debian/patches/0001-replace-pkexec-by-sudo.patch | 12 ++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index efde3f2..a548a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +calamares (3.2.12-0ubuntu1) eoan; urgency=medium + + * New upstream release. + * Update debian/compat to 12, no changes needed. + * Adjust desktop patch to NotShowIn=LXQt. + + -- Dan Simmons Sun, 11 Aug 2019 20:46:30 -0400 + calamares (3.2.11-0ubuntu1) eoan; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/patches/0001-replace-pkexec-by-sudo.patch b/debian/patches/0001-replace-pkexec-by-sudo.patch index ad9ca01..7d69b52 100644 --- a/debian/patches/0001-replace-pkexec-by-sudo.patch +++ b/debian/patches/0001-replace-pkexec-by-sudo.patch @@ -6,16 +6,20 @@ Subject: replace pkexec by sudo calamares.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/calamares.desktop b/calamares.desktop -index f8be5d1..53c2424 100644 --- a/calamares.desktop +++ b/calamares.desktop -@@ -5,7 +5,7 @@ Name=Install System +@@ -5,12 +5,13 @@ Name=Install System GenericName=System Installer - Keywords=calamares;system;installer + Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sudo /usr/bin/calamares Comment=Calamares — System Installer Icon=calamares Terminal=false + StartupNotify=true + Categories=Qt;System; ++NotShowIn=LXQt; + X-AppStream-Ignore=true + + Name[ar]=تثبيت النظام From c2221d578729f8025dcf72ad65dff1c703acb8ab Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Wed, 9 Oct 2019 14:57:59 -0500 Subject: [PATCH 03/20] Package Calamares for new upstream release Summary: Update to calamares-settings-ubuntu must follow. Update copyright for appdata file. Remove PythonQt depend. Update copyright for 3rdparty code. Test Plan: Test Calamares install. Reviewers: tsimonq2, wxl Reviewed By: tsimonq2 Differential Revision: https://phab.lubuntu.me/D50 --- debian/changelog | 9 ++++ debian/control | 2 - debian/copyright | 127 ++++++++++++++++++++++++++++++++++++++++++++++- debian/rules | 2 +- 4 files changed, 135 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a548a13..8752024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +calamares (3.2.14-0ubuntu1) eoan; urgency=medium + + * New upstream release. + * Update copyright information for appdata file. + * Do not build against PythonQt. + * Update copyright to point to 3rdparty code directory. + + -- Dan Simmons Tue, 08 Oct 2019 18:55:30 -0400 + calamares (3.2.12-0ubuntu1) eoan; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 47db7b6..cad169f 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,6 @@ Build-Depends: cmake, libparted-dev, libpolkit-qt5-1-dev, libpwquality-dev, - libpythonqt-qt5-python3-dev, - libpythonqt-qtall-qt5-python3-dev, libqt5svg5-dev, libqt5webkit5-dev, libyaml-cpp-dev, diff --git a/debian/copyright b/debian/copyright index acdb092..67156f1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -46,6 +46,129 @@ Copyright: 2017-2019, Adriaan de Groot 1999, Ian Zepp (icszepp@islc.net) License: GPL-3+ +Files: io.calamares.calamares.appdata.xml +Copyright: Copyright is waived to the maximum extent possible +License: CC0-1.0 + CC0 1.0 Universal + . + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + . + Statement of Purpose + . + The laws of most jurisdictions throughout the world automatically confer + exclusive Copyright and Related Rights (defined below) upon the creator + and subsequent owner(s) (each and all, an "owner") of an original work of + authorship and/or a database (each, a "Work"). + . + Certain owners wish to permanently relinquish those rights to a Work for + the purpose of contributing to a commons of creative, cultural and + scientific works ("Commons") that the public can reliably and without fear + of later claims of infringement build upon, modify, incorporate in other + works, reuse and redistribute as freely as possible in any form whatsoever + and for any purposes, including without limitation commercial purposes. + These owners may contribute to the Commons to promote the ideal of a free + culture and the further production of creative, cultural and scientific + works, or to gain reputation or greater distribution for their Work in + part through the use and efforts of others. + . + For these and/or other purposes and motivations, and without any + expectation of additional consideration or compensation, the person + associating CC0 with a Work (the "Affirmer"), to the extent that he or she + is an owner of Copyright and Related Rights in the Work, voluntarily + elects to apply CC0 to the Work and publicly distribute the Work under its + terms, with knowledge of his or her Copyright and Related Rights in the + Work and the meaning and intended legal effect of CC0 on those rights. + . + 1. Copyright and Related Rights. A Work made available under CC0 may be + protected by copyright and related or neighboring rights ("Copyright and + Related Rights"). Copyright and Related Rights include, but are not + limited to, the following: + . + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); + iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and + vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + . + 2. Waiver. To the greatest extent permitted by, but not in contravention + of, applicable law, Affirmer hereby overtly, fully, permanently, + irrevocably and unconditionally waives, abandons, and surrenders all of + Affirmer's Copyright and Related Rights and associated claims and causes + of action, whether now known or unknown (including existing as well as + future claims and causes of action), in the Work (i) in all territories + worldwide, (ii) for the maximum duration provided by applicable law or + treaty (including future time extensions), (iii) in any current or future + medium and for any number of copies, and (iv) for any purpose whatsoever, + including without limitation commercial, advertising or promotional + purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each + member of the public at large and to the detriment of Affirmer's heirs and + successors, fully intending that such Waiver shall not be subject to + revocation, rescission, cancellation, termination, or any other legal or + equitable action to disrupt the quiet enjoyment of the Work by the public + as contemplated by Affirmer's express Statement of Purpose. + . + 3. Public License Fallback. Should any part of the Waiver for any reason + be judged legally invalid or ineffective under applicable law, then the + Waiver shall be preserved to the maximum extent permitted taking into + account Affirmer's express Statement of Purpose. In addition, to the + extent the Waiver is so judged Affirmer hereby grants to each affected + person a royalty-free, non transferable, non sublicensable, non exclusive, + irrevocable and unconditional license to exercise Affirmer's Copyright and + Related Rights in the Work (i) in all territories worldwide, (ii) for the + maximum duration provided by applicable law or treaty (including future + time extensions), (iii) in any current or future medium and for any number + of copies, and (iv) for any purpose whatsoever, including without + limitation commercial, advertising or promotional purposes (the + "License"). The License shall be deemed effective as of the date CC0 was + applied by Affirmer to the Work. Should any part of the License for any + reason be judged legally invalid or ineffective under applicable law, such + partial invalidity or ineffectiveness shall not invalidate the remainder + of the License, and in such case Affirmer hereby affirms that he or she + will not (i) exercise any of his or her remaining Copyright and Related + Rights in the Work or (ii) assert any associated claims and causes of + action with respect to the Work, in either case contrary to Affirmer's + express Statement of Purpose. + . + 4. Limitations and Disclaimers. + . + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. + Files: src/qml/calamares/slideshow/*qml Copyright: 2017, Adriaan de Groot 2016 The Qt Company Ltd @@ -59,7 +182,7 @@ 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: src/libcalamaresui/widgets/waitingspinnerwidget.* +Files: 3rdparty/waitingspinnerwidget.* Copyright: 2012-2014 Alexander Turkin 2014 by William Hallatt 2015 by Jacob Dawid @@ -81,7 +204,7 @@ License: Expat 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: src/libcalamares/kdsingleapplicationguard/* +Files: 3rdparty/kdsingleapplicationguard/* Copyright: 2001-2010 Klaralvdalens Datakonsult AB License: LGPL-2 This library is free software: you can redistribute it and/or modify diff --git a/debian/rules b/debian/rules index 6eb0ae0..c255054 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all dh $@ --with kf5 override_dh_auto_configure: - dh_auto_configure -- -DWITH_PYTHONQT=ON -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + dh_auto_configure -- -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # Some test don't work well, we don't need to run them at package build time. override_dh_auto_test: From 24f981053cda9b0422cc0c2b8686c88c5bd78818 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Wed, 9 Oct 2019 19:09:38 -0400 Subject: [PATCH 04/20] Refresh apport-hook patch Summary: Adjust the apport-package-hook patch for the proper log directory. Test Plan: Make sure logs are attached to bug reports. Reviewers: wxl, tsimonq2 Differential Revision: https://phab.lubuntu.me/D54 --- debian/changelog | 7 +++++++ debian/patches/apport-package-hook.patch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8752024..d66220e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares (3.2.14-0ubuntu2) eoan; urgency=medium + + * Refresh apport-package-hook.patch for change in log directory + name. + + -- Dan Simmons Wed, 09 Oct 2019 18:04:16 -0400 + calamares (3.2.14-0ubuntu1) eoan; urgency=medium * New upstream release. diff --git a/debian/patches/apport-package-hook.patch b/debian/patches/apport-package-hook.patch index 27bfd84..a143b00 100644 --- a/debian/patches/apport-package-hook.patch +++ b/debian/patches/apport-package-hook.patch @@ -52,7 +52,7 @@ Author: Walter Lapchynski +for module in module_names: + installed_modules.append(module_path + module + ".conf") + -+log_file = expanduser("~") + "/.cache/Calamares/session.log" ++log_file = expanduser("~") + "/.cache/calamares/session.log" + +config_file = "/etc/calamares/settings.conf" + From 0dc46120aa098644f90330bb46ddbe61320d67f3 Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Mon, 28 Oct 2019 09:22:20 +0000 Subject: [PATCH 05/20] No-change rebuild against libkpmcore8 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d66220e..174c425 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.14-0ubuntu3) focal; urgency=medium + + * No-change rebuild against libkpmcore8. + + -- Rik Mills Mon, 28 Oct 2019 09:08:28 +0000 + calamares (3.2.14-0ubuntu2) eoan; urgency=medium * Refresh apport-package-hook.patch for change in log directory From c0bc4051350c316f3d0f47bc7aaf3e0e55600151 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Thu, 26 Dec 2019 18:43:28 -0500 Subject: [PATCH 06/20] Package Calamares for new upstream release. Summary: Update standards-version to 4.4.1 Add lintian override for false spelling error. Calamares to version to 3.2.17.1 hot fix release. Test Plan: Test Calamares install. Reviewers: wxl, tsimonq2 Differential Revision: https://phab.lubuntu.me/D64 --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/lintian-overrides | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 174c425..af51e18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +calamares (3.2.17.1-0ubuntu1) focal; urgency=medium + + * New upstream release. + * Bump Standards-version to 4.4.1, no changes needed. + * Add lintian override for false-positive spelling error. + + -- Dan Simmons Tue, 03 Dec 2019 22:04:34 -0500 + calamares (3.2.14-0ubuntu3) focal; urgency=medium * No-change rebuild against libkpmcore8. diff --git a/debian/control b/debian/control index cad169f..2dca7eb 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Build-Depends: cmake, qtdeclarative5-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Homepage: https://github.com/calamares/calamares Vcs-Browser: https://phab.lubuntu.me/source/calamares/ Vcs-Git: https://phab.lubuntu.me/source/calamares.git diff --git a/debian/lintian-overrides b/debian/lintian-overrides index c0a2cf1..d299b39 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 + +# Override false spelling error +calamares: spelling-error-in-binary usr/bin/calamares WHe When From 4efcfde7475b3ca3c23b42b3de59e759c00dc33a Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Sun, 9 Feb 2020 21:24:22 +0000 Subject: [PATCH 07/20] sync with archive changelog --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index af51e18..9eaa316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +calamares (3.2.17.1-0ubuntu3) focal; urgency=medium + + * No change rebuild against new boost1.71 ABI + + -- Dimitri John Ledkov Mon, 03 Feb 2020 20:00:58 +0000 + +calamares (3.2.17.1-0ubuntu2) focal; urgency=medium + + * No-change rebuild to build with python3.8. + + -- Matthias Klose Sat, 25 Jan 2020 05:40:26 +0000 + calamares (3.2.17.1-0ubuntu1) focal; urgency=medium * New upstream release. From 4989aced7ac4a9e893a8872e838f23e13ba95b67 Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Sun, 9 Feb 2020 21:25:05 +0000 Subject: [PATCH 08/20] fix FTBFS with boost 1.71 --- debian/changelog | 7 +++++++ debian/patches/cmake-fix-find-boost.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/cmake-fix-find-boost.patch diff --git a/debian/changelog b/debian/changelog index 9eaa316..a5444d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares (3.2.17.1-0ubuntu4) focal; urgency=medium + + * Add patch to fix cmake finding boost 1.71. Fixes FTBFS. + - debian/patches: cmake-fix-find-boost.patch + + -- Rik Mills Sun, 09 Feb 2020 20:43:08 +0000 + calamares (3.2.17.1-0ubuntu3) focal; urgency=medium * No change rebuild against new boost1.71 ABI diff --git a/debian/patches/cmake-fix-find-boost.patch b/debian/patches/cmake-fix-find-boost.patch new file mode 100644 index 0000000..6e6f93b --- /dev/null +++ b/debian/patches/cmake-fix-find-boost.patch @@ -0,0 +1,16 @@ +Description: CMake: fix find-boost with 1.71 +Origin: https://github.com/calamares/calamares/commit/c482990bc5b5233e2f4abda75fda8700308f5bea + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -322,6 +322,10 @@ + ) + + if ( PYTHONLIBS_FOUND ) ++ # Since Boost provides CMake config files (starting with Boost 1.70. ++ # or so) the mess that is the Calamares find code picks the wrong ++ # bits. Suppress those CMake config files, as suggested by @jmrcpn ++ set(Boost_NO_BOOST_CMAKE ON) + include( BoostPython3 ) + find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) + set_package_properties( diff --git a/debian/patches/series b/debian/patches/series index 683ca99..646c946 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch +cmake-fix-find-boost.patch From ccf1fc2c49d646f73abc57f17b285fb0121f9d9f Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Sun, 9 Feb 2020 22:44:55 +0000 Subject: [PATCH 09/20] No-change rebuild for libkpmcore9 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a5444d3..99711b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.17.1-0ubuntu5) focal; urgency=medium + + * No-change rebuild for libkpmcore9. + + -- Rik Mills Sun, 09 Feb 2020 21:40:17 +0000 + calamares (3.2.17.1-0ubuntu4) focal; urgency=medium * Add patch to fix cmake finding boost 1.71. Fixes FTBFS. From 9c3fa4648af8ed95e9948813a1c3f7f60e8390bd Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 22:53:47 -0500 Subject: [PATCH 10/20] Bump version for new upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 99711b5..53e55e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 + calamares (3.2.17.1-0ubuntu5) focal; urgency=medium * No-change rebuild for libkpmcore9. From d968c14ec3fe2f7b1944e34d82afb89ddf57e17b Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:00:59 -0500 Subject: [PATCH 11/20] Update copyright years. --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53e55e6..e131b09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Update copyright years. -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 diff --git a/debian/copyright b/debian/copyright index 67156f1..e2ac4d3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: calamares Source: https://github.com/calamares/calamares Files: * -Copyright: 2017-2019, Adriaan de Groot +Copyright: 2017-2020, Adriaan de Groot 2017-2018, Alf Gaida 2017-2018, Gabriel Craciunescu 2018, Philip Müller @@ -225,7 +225,7 @@ License: LGPL-2 Files: debian/* Copyright: 2014 Rohan Garg 2016-2017 Jonathan Carter - 2018-2019 Simon Quigley + 2018-2020 Simon Quigley License: GPL-3+ License: GPL-3+ From 524a0dc9d3aaf196b2336e9babfc8ccd6827ff5c Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:12:02 -0500 Subject: [PATCH 12/20] Update debian/control. --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index e131b09..83e4148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update copyright years. + * Bump Standards-Version to 4.5.0, no changes needed. + * Update debian/control with debhelper-compat (= 12), remove + debian/compat. -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 2dca7eb..bc56ad0 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Lubuntu Developers XSBC-Original-Maintainer: Jonathan Carter Build-Depends: cmake, cryptsetup, - debhelper (>= 12), + debhelper-compat (= 12), extra-cmake-modules, gettext, libatasmart-dev, @@ -38,7 +38,7 @@ Build-Depends: cmake, qtdeclarative5-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Homepage: https://github.com/calamares/calamares Vcs-Browser: https://phab.lubuntu.me/source/calamares/ Vcs-Git: https://phab.lubuntu.me/source/calamares.git @@ -55,7 +55,7 @@ Description: distribution-independent installer framework It provides a graphical installer that can be used with nearly any distribution. This package is suitable for live media on Debian-based systems, and won't be of any particular use on - and already installed system. + an already installed system. . You will likely want to provide your own config files to match your distribution, reading the Calamares documentation will guide From 8dd75635b6be4bf925f4f77cdcf9c037c11d3d02 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:18:59 -0500 Subject: [PATCH 13/20] Remove cmake patch, code applied upstream. --- debian/changelog | 1 + debian/patches/cmake-fix-find-boost.patch | 16 ---------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 debian/patches/cmake-fix-find-boost.patch diff --git a/debian/changelog b/debian/changelog index 83e4148..c3fc6c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium * Bump Standards-Version to 4.5.0, no changes needed. * Update debian/control with debhelper-compat (= 12), remove debian/compat. + * Remove cmake-fix-find-boost.patch, code applied upstream. -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 diff --git a/debian/patches/cmake-fix-find-boost.patch b/debian/patches/cmake-fix-find-boost.patch deleted file mode 100644 index 6e6f93b..0000000 --- a/debian/patches/cmake-fix-find-boost.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: CMake: fix find-boost with 1.71 -Origin: https://github.com/calamares/calamares/commit/c482990bc5b5233e2f4abda75fda8700308f5bea - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -322,6 +322,10 @@ - ) - - if ( PYTHONLIBS_FOUND ) -+ # Since Boost provides CMake config files (starting with Boost 1.70. -+ # or so) the mess that is the Calamares find code picks the wrong -+ # bits. Suppress those CMake config files, as suggested by @jmrcpn -+ set(Boost_NO_BOOST_CMAKE ON) - include( BoostPython3 ) - find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) - set_package_properties( diff --git a/debian/patches/series b/debian/patches/series index 646c946..683ca99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch -cmake-fix-find-boost.patch From 95e7f31fae9877516c16903fc8837c6f462a732c Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:29:11 -0500 Subject: [PATCH 14/20] Remove unneeded lintian override. --- debian/changelog | 1 + debian/lintian-overrides | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3fc6c2..ed93cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium * Update debian/control with debhelper-compat (= 12), remove debian/compat. * Remove cmake-fix-find-boost.patch, code applied upstream. + * Remove unneeded lintian override. -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 diff --git a/debian/lintian-overrides b/debian/lintian-overrides index d299b39..c0a2cf1 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -8,6 +8,3 @@ 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 - -# Override false spelling error -calamares: spelling-error-in-binary usr/bin/calamares WHe When From 1f24d3b9aac748864298130ba71b2892e7b49be2 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 15 Feb 2020 23:31:09 -0500 Subject: [PATCH 15/20] Upload to focal. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed93cbc..af7fe5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.18-0ubuntu1) focal; urgency=medium * New upstream release. * Update copyright years. @@ -8,7 +8,7 @@ calamares (3.2.18-0ubuntu1) UNRELEASED; urgency=medium * Remove cmake-fix-find-boost.patch, code applied upstream. * Remove unneeded lintian override. - -- Dan Simmons Sat, 15 Feb 2020 22:50:34 -0500 + -- Dan Simmons Sat, 15 Feb 2020 23:30:04 -0500 calamares (3.2.17.1-0ubuntu5) focal; urgency=medium From d732ec0dafc322a52f53bd7c40c5faf763aa92b1 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Fri, 21 Feb 2020 20:14:13 -0500 Subject: [PATCH 16/20] Bump version for new upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index af7fe5e..0843351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.19-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Fri, 21 Feb 2020 20:12:53 -0500 + calamares (3.2.18-0ubuntu1) focal; urgency=medium * New upstream release. From ade23b607573aaedeb3f4f3d16a97861ff77dbd2 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sat, 22 Feb 2020 08:33:31 -0500 Subject: [PATCH 17/20] Upload to focal. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0843351..c776665 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -calamares (3.2.19-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.19-0ubuntu1) focal; urgency=medium * New upstream release. + * Improved partition handling with kpmcore (LP: #1851188) - -- Dan Simmons Fri, 21 Feb 2020 20:12:53 -0500 + -- Dan Simmons Sat, 22 Feb 2020 08:16:53 -0500 calamares (3.2.18-0ubuntu1) focal; urgency=medium From afd20277e930e2c82bb739180e66d7103a63b456 Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Mon, 24 Feb 2020 13:38:57 -0800 Subject: [PATCH 18/20] New upstream release. --- debian/changelog | 7 +++++++ debian/copyright | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c776665..20b137f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares (3.2.19.1-0ubuntu1) focal; urgency=medium + + * New upstream release. + * Update copyright file. + + -- Walter Lapchynski Mon, 24 Feb 2020 13:13:33 -0800 + calamares (3.2.19-0ubuntu1) focal; urgency=medium * New upstream release. diff --git a/debian/copyright b/debian/copyright index e2ac4d3..a004f71 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Files: * Copyright: 2017-2020, Adriaan de Groot 2017-2018, Alf Gaida 2017-2018, Gabriel Craciunescu - 2018, Philip Müller + 2018-2020, Philip Müller 2018, AlmAck 2018, Caio Carvalho 2017, Kyle Robbertze From c6129ea27e27dfb369da60dbfb90c42e5e873ba4 Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Thu, 27 Feb 2020 17:50:57 -0500 Subject: [PATCH 19/20] Bump version for new upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 20b137f..bf73be3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.2.20-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Dan Simmons Thu, 27 Feb 2020 17:48:41 -0500 + calamares (3.2.19.1-0ubuntu1) focal; urgency=medium * New upstream release. From 72c824bff463af433e87898cb9942d1a00181d7a Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Thu, 27 Feb 2020 18:00:18 -0500 Subject: [PATCH 20/20] Upload to focal. --- debian/changelog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf73be3..713af7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ -calamares (3.2.20-0ubuntu1) UNRELEASED; urgency=medium +calamares (3.2.20-0ubuntu1) focal; urgency=medium * New upstream release. + * Improved debug logging. + * Improvements in contextualprocess and partition modules. - -- Dan Simmons Thu, 27 Feb 2020 17:48:41 -0500 + -- Dan Simmons Thu, 27 Feb 2020 17:59:28 -0500 calamares (3.2.19.1-0ubuntu1) focal; urgency=medium - * New upstream release. - * Update copyright file. + * New upstream release. + * Update copyright file. -- Walter Lapchynski Mon, 24 Feb 2020 13:13:33 -0800