Merge pull request #35 from Hayao0819/master

v3.2.30の更新とサイドバーの色の変更

.clang-format

@@ -1,3 +1,5 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
 ---
 BasedOnStyle: WebKit
 

.editorconfig

@@ -1,4 +1,5 @@
-# http://EditorConfig.org
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
 
 root = true
 

.gitattributes

@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+
 .editorconfig                  export-ignore
 .gitattributes                 export-ignore
 .github                        export-ignore

.gitignore

@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # C++ objects and libs
 
 *.slo

.reuse/dep5

@@ -0,0 +1,85 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Calamares
+Source: https://github.com/calamares/calamares.git
+
+### ACTUAL LICENSES
+#
+# Images in the locale module are a bit unclear; they were added
+# by Teo in 2014 but I suspect they came from somewhere else.
+#
+Files: src/modules/locale/images/timezone*.png
+License: GPL-3.0-or-later
+Copyright: 2014 Teo Mrnjavac <[email protected]>
+
+Files: man/calamares.8
+License: GPL-3.0-or-later
+Copyright: 2017 Jonathan Carter <[email protected]>
+
+### BUILD ARTIFACTS / NOT SOURCE
+#
+# QRC Files are basically build artifacts
+#
+FILES: src/modules/*/*.qrc
+License: CC0-1.0
+Copyright: no
+
+# GitHub issue templates are not part of the source
+#
+Files: .github/ISSUE_TEMPLATE/*
+License: CC0-1.0
+Copyright: no
+
+# Packaging information
+#
+Files: data/FreeBSD/distinfo data/FreeBSD/pkg-descr data/FreeBSD/pkg-plist
+License: CC0-1.0
+Copyright: no
+
+# Example data for timezones, which is copied out of zoneinfo,
+# which has this notice:
+#
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+Files: data/example-root/usr/share/zoneinfo/Zulu data/example-root/usr/share/zoneinfo/UTC data/example-root/usr/share/zoneinfo/America/New_York
+License: CC0-1.0
+Copyright: no
+
+### TRANSLATIONS
+#
+# .desktop files and template change only with translation
+#
+FILES: calamares.desktop*
+License: CC0-1.0
+Copyright: no
+
+# Transifex translations derive from the source, and have no
+# embedded copyright information.
+#
+Files: lang/*.ts
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators
+
+# Translations of branding slideshow are the same
+Files: src/branding/default/lang/*.ts
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators
+
+# Python translation files have some copyright information, but
+# it's generally very sketchy.
+#
+Files: lang/python.pot
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators
+
+Files: lang/python/*/LC_MESSAGES/python.po
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators
+
+Files: src/modules/dummypythonqt/lang/dummypythonqt.pot
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators
+
+Files: src/modules/dummypythonqt/lang/*/LC_MESSAGES/dummypythonqt.po
+License: GPL-3.0-or-later
+Copyright: 2020 Calamares authors and translators

.travis.yml

@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 language: cpp
 
 python:

.tx/config

@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+
 [main]
 host = https://www.transifex.com
 

3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/kdtoolsglobal.h

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/kdsingleapplicationguard/pimpl_ptr.h

@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */

3rdparty/waitingspinnerwidget.cpp

@@ -1,6 +1,8 @@
 /*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
  *   SPDX-License-Identifier: MIT
- *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */
 
 /* Original Work Copyright (c) 2012-2014 Alexander Turkin

3rdparty/waitingspinnerwidget.h

@@ -1,11 +1,14 @@
 /*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
  *   SPDX-License-Identifier: MIT
- *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */
 
 /* Original Work Copyright (c) 2012-2014 Alexander Turkin
    Modified 2014 by William Hallatt
    Modified 2015 by Jacob Dawid
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to

AUTHORS

@@ -1,3 +1,7 @@
+<!-- SPDX-FileCopyrightText: no
+     SPDX-License-Identifier: CC0-1.0
+-->
+
 # MAINTAINER
 
 Calamares development is sponsored by Blue Systems GmbH - Liberating Software.

CHANGES

@@ -1,8 +1,78 @@
+<!-- SPDX-FileCopyrightText: no
+     SPDX-License-Identifier: CC0-1.0
+-->
+
 This is the changelog for Calamares. For each release, the major changes and
 contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.30 (2020-09-03) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
+ - Asif Mahmud Shimon
+ - Manzoor Ahmed Munawar
+ - Sai Kamal
+ - Victor Ibragimov
+
+This release has two giant source-code changes that have no effect
+on functionality, but do touch each and every source file:
+ - SPDX headers for licensing information, following the standard
+   set by REUSE.software ; all source files and resources have
+   SPDX-License-Identifier information and copyright notices. All
+   of the boilerplate texts have been removed.
+ - Calamares coding style has been mechanically applied to the entire
+   codebase. This was already done to most of it, but there were
+   some hold-outs.
+
+## Core ##
+ - Network access status is deprecated in Qt 5.15's QNetworkAccessManager,
+   and was not useful already in some previous versions. Replace its
+   use in the Calamares network service by testing-it-ourself directly
+   via a synchronous ping. (Thanks to Asif)
+ - New Telugu translation. (Thanks to Sai)
+ - Urdu translation started. (Thanks to Manzoor)
+ - Timezones translated in Tajik and Russian. (Thanks to Victor)
+
+## Modules ##
+ - *keyboardq* and *localeq* improvements. (Thanks to Anke)
+ - *users* module did not set up autologin properly. This is yet another
+   regression left over from 3.2.28. (Reported by Phil and pcrepix, #1498)
+ - *welcome* module now sets the *LANG* key in the locale configuration
+   (which is shared with the *locale* module and consumed by the
+   *localecfg* module). This makes it feasible to drop the *locale*
+   module and still set the installed system's language to the language
+   selected in Calamares. (Reported by FerenOS)
+
+
+# 3.2.29 (2020-08-20) #
+
+This release contains contributions from (alphabetically by first name):
+ - Asif Mahmud Shimon (new contributor! hi!)
+
+## Core ##
+ - Edge case in extracting string-lists from YAML, reported and fixed
+   by Asif (#1491).
+ - Progress reporting is now more flexible. Modules can have a weight
+   assigned to them in the descriptor; module instances can have a weight
+   assigned which overrides the module descriptor. When jobs are run
+   for a module instance, the jobs report progress pro-rated by the
+   module's weight. Or in other words, it is now possible to tweak
+   the amount of the overall progress bar that different modules fill.
+   The default settings give unpackfs a weight of 12. (#1176)
+
+## Modules ##
+ - The *users* module did not read the *defaultGroups* correctly.
+   Fixed by the string-lists change mentioned above.
+
+
+ # 3.2.28.3 (2020-08-18) #
+
+Another hotfix, for more issues reported by Marco Obaid. Users
+were not having a password set (#1489)
+
+
 # 3.2.28.2 (2020-08-12) #
 
 A second hotfix, for autologin support -- the autologin group was not

CMakeLists.txt

@@ -1,20 +1,15 @@
-# === This file is part of Calamares - <https://github.com/calamares> ===
+# === This file is part of Calamares - <https://calamares.io> ===
 #
 #   SPDX-FileCopyrightText: 2017 Adriaan de Groot <[email protected]>
-#   SPDX-License-Identifier: GPL-3.0-or-later
+#   SPDX-License-Identifier: BSD-2-Clause
 #
-#   Calamares is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
+###
 #
-#   Calamares is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#   GNU General Public License for more details.
+#   Calamares is Free Software: see the License-Identifier above.
 #
-#   You should have received a copy of the GNU General Public License
-#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+#   Individual files may have different licenses (like the CMake
+#   infrastructure, which is BSD-2-Clause licensed). Check the SPDX
+#   identifiers in each file.
 #
 ###
 #
@@ -46,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.28.2
+    VERSION 3.2.30
     LANGUAGES C CXX )
 
 set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
@@ -145,13 +140,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
 #
-# Total 68 languages
-set( _tx_complete ca fi_FI he hr nl pt_BR sq tg tr_TR uk zh_TW )
-set( _tx_good as ast az az_AZ be cs_CZ da de es fr hi hu it_IT ja
-    ko lt ml pt_PT ru sk sv zh_CN )
-set( _tx_ok ar bg el en_GB es_MX es_PR et eu fa gl id is mr nb
-    pl ro sl sr sr@latin th )
-set( _tx_incomplete bn ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP
+# Total 69 languages
+set( _tx_complete az az_AZ ca cs_CZ da fi_FI he hi hr ja nl pt_BR
+    sq sv tg tr_TR uk zh_TW )
+set( _tx_good as ast be de es fr hu it_IT ko lt ml pt_PT ru sk
+    zh_CN )
+set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu fa gl id is mr nb
+    pl ro sl sr sr@latin te th )
+set( _tx_incomplete ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP
     ur uz )
 
 ### Required versions