Merge branch 'ci/stable' into ci/unstable

ci/unstable
Simon Quigley 4 years ago
commit ab78c4b0b2

95
debian/changelog vendored

@ -1,3 +1,92 @@
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 information for appdata file.
* Do not build against PythonQt.
* Update copyright to point to 3rdparty code directory.
-- Dan Simmons <kc2bez@lubuntu.me> Tue, 08 Oct 2019 18:55:30 -0400
calamares (3.2.12-0ubuntu1) eoan; urgency=medium
* New upstream release.
@ -16,12 +105,6 @@ calamares (3.2.11-0ubuntu1) eoan; urgency=medium
-- Dan Simmons <kc2bez@lubuntu.me> Fri, 12 Jul 2019 19:52:38 -0400
calamares (3.2.10-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 01 Jul 2019 15:33:23 -0500
calamares (3.2.7-0ubuntu1) eoan; urgency=medium
* New upstream release.

8
debian/control vendored

@ -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,
@ -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,
@ -40,7 +38,7 @@ Build-Depends: cmake,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools
Standards-Version: 4.4.0
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
@ -57,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

133
debian/copyright vendored

@ -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>
@ -46,6 +46,129 @@ Copyright: 2017-2019, Adriaan de Groot <groot@kde.org>
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 <groot@kde.org>
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
@ -102,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+

@ -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"
+

2
debian/rules vendored

@ -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:

Loading…
Cancel
Save