Merge branch 'ubuntu/focal' into ci/stable

2025-04-13 04:01:16 +00:00 · 2020-04-23 03:47:50 -05:00 · 2020-04-23 03:47:50 -05:00 · 13d90e5aa6
commit 13d90e5aa6
parent 64723453e1 72c824bff4
4 changed files with 110 additions and 14 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,13 +1,109 @@
+calamares (3.2.20-0ubuntu1) focal; urgency=medium
+
+  * New upstream release.
+  * Improved debug logging.
+  * Improvements in contextualprocess and partition modules.
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Thu, 27 Feb 2020 17:59:28 -0500
+
+calamares (3.2.19.1-0ubuntu1) focal; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Mon, 24 Feb 2020 13:13:33 -0800
+
+calamares (3.2.19-0ubuntu1) focal; urgency=medium
+
+  * New upstream release.
+  * Improved partition handling with kpmcore (LP: #1851188)
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Sat, 22 Feb 2020 08:16:53 -0500
+
+calamares (3.2.18-0ubuntu1) focal; 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.
+  * Remove cmake-fix-find-boost.patch, code applied upstream.
+  * Remove unneeded lintian override.
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Sat, 15 Feb 2020 23:30:04 -0500
+
+calamares (3.2.17.1-0ubuntu5) focal; urgency=medium
+
+  * No-change rebuild for libkpmcore9.
+
+ -- Rik Mills <rikmills@kde.org>  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.
+    - debian/patches: cmake-fix-find-boost.patch
+
+ -- Rik Mills <rikmills@kde.org>  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
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  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 <doko@ubuntu.com>  Sat, 25 Jan 2020 05:40:26 +0000
+
+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 <kc2bez@lubuntu.me>  Tue, 03 Dec 2019 22:04:34 -0500
+
+calamares (3.2.14-0ubuntu3) focal; urgency=medium
+
+  * No-change rebuild against libkpmcore8.
+
+ -- Rik Mills <rikmills@kde.org>  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
+    name.
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Wed, 09 Oct 2019 18:04:16 -0400
+
 calamares (3.2.14-0ubuntu1) eoan; urgency=medium

  * New upstream release.
-  * Update copyright for appdata file.
+  * Update copyright information for appdata file.
  * Do not build against PythonQt.
-  * Refresh calamares.desktop patch.
-  * Bump Standards-version, no changes needed.
-  * Fix debian/compat to proper debhelper version.
+  * Update copyright to point to 3rdparty code directory.

- -- Dan Simmons <kc2bez@lubuntu.me>  Fri, 04 Oct 2019 21:18:35 -0400
+ -- Dan Simmons <kc2bez@lubuntu.me>  Tue, 08 Oct 2019 18:55:30 -0400
+
+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 <kc2bez@lubuntu.me>  Sun, 11 Aug 2019 20:46:30 -0400
+
+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 <kc2bez@lubuntu.me>  Fri, 12 Jul 2019 19:52:38 -0400

 calamares (3.2.7-0ubuntu1) eoan; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -5,7 +5,7 @@ Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Jonathan Carter <jcc@debian.org>
 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
--- a/debian/copyright
+++ b/debian/copyright
@ -3,10 +3,10 @@ Upstream-Name: calamares
 Source: https://github.com/calamares/calamares

 Files: *
-Copyright: 2017-2019, Adriaan de Groot <groot@kde.org>
+Copyright: 2017-2020, Adriaan de Groot <groot@kde.org>
           2017-2018, Alf Gaida <agaida@siduction.org>
           2017-2018, Gabriel Craciunescu <crazy@frugalware.org>
-           2018, Philip Müller <philm@manjaro.org>
+           2018-2020, Philip Müller <philm@manjaro.org>
           2018, AlmAck <gluca86@gmail.com>
           2018, Caio Carvalho <caiojcarvalho@gmail.com>
 	   2017, Kyle Robbertze <krobbertze@gmail.com>
@ -182,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
@ -204,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
@ -225,7 +225,7 @@ License: LGPL-2
 Files: debian/*
 Copyright: 2014 Rohan Garg <rohan@kde.org>
           2016-2017 Jonathan Carter <jcc@debian.org>
-           2018-2019 Simon Quigley <tsimonq2@ubuntu.com>
+           2018-2020 Simon Quigley <tsimonq2@ubuntu.com>
 License: GPL-3+

 License: GPL-3+
--- a/debian/patches/apport-package-hook.patch
+++ b/debian/patches/apport-package-hook.patch
@ -52,7 +52,7 @@ Author: Walter Lapchynski <wxl@ubuntu.com>
 +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"
 +