From c2221d578729f8025dcf72ad65dff1c703acb8ab Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Wed, 9 Oct 2019 14:57:59 -0500 Subject: [PATCH] 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: