From eee9dee87f1b4a7e5d5f5b1206c0c67aa7f4d8f7 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Thu, 28 May 2020 21:43:43 +0100 Subject: [PATCH 1/7] [lang] Update SPDX identifiers. --- lang/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 37ea8356c..efc6d6188 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### From 280e367c8638997e4c211ab7fcefc5414504722b Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Thu, 28 May 2020 21:44:27 +0100 Subject: [PATCH 2/7] [/] Update SPDX identifiers. Update CMakeLists.txt --- CMakeLists.txt | 2 +- io.calamares.calamares.appdata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 519ee1abc..a22c8f587 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/io.calamares.calamares.appdata.xml b/io.calamares.calamares.appdata.xml index 355f485c2..d49a33b0f 100644 --- a/io.calamares.calamares.appdata.xml +++ b/io.calamares.calamares.appdata.xml @@ -2,7 +2,7 @@ io.calamares.calamares.desktop CC0-1.0 - GPL-3.0+ + GPL-3.0-or-later Calamares Calamares Calamares From 0d4642ca6a94f05ea279b5cdbb738a483c5baa2e Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Thu, 28 May 2020 21:46:47 +0100 Subject: [PATCH 3/7] [CMakeModules] Update SPDX identifiers. Update CalamaresAddTest.cmake Update CalamaresAddLibrary.cmake Update CalamaresAddBrandingSubdirectory.cmake Update CalamaresAddTranslations.cmake Update CalamaresAddPlugin.cmake Update CalamaresAddModuleSubdirectory.cmake --- CMakeModules/CalamaresAddBrandingSubdirectory.cmake | 2 +- CMakeModules/CalamaresAddLibrary.cmake | 2 +- CMakeModules/CalamaresAddModuleSubdirectory.cmake | 2 +- CMakeModules/CalamaresAddPlugin.cmake | 2 +- CMakeModules/CalamaresAddTest.cmake | 2 +- CMakeModules/CalamaresAddTranslations.cmake | 2 +- CMakeModules/CalamaresAutomoc.cmake | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake index 80cf86f38..9283b48a7 100644 --- a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake +++ b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAddLibrary.cmake b/CMakeModules/CalamaresAddLibrary.cmake index 0829d919e..6155293d7 100644 --- a/CMakeModules/CalamaresAddLibrary.cmake +++ b/CMakeModules/CalamaresAddLibrary.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 981ec4a01..fe4f34f94 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAddPlugin.cmake b/CMakeModules/CalamaresAddPlugin.cmake index c8f81e684..66536eda7 100644 --- a/CMakeModules/CalamaresAddPlugin.cmake +++ b/CMakeModules/CalamaresAddPlugin.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake index 65f9389e8..4dd673745 100644 --- a/CMakeModules/CalamaresAddTest.cmake +++ b/CMakeModules/CalamaresAddTest.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAddTranslations.cmake b/CMakeModules/CalamaresAddTranslations.cmake index d74e4bdfb..bb15fb122 100644 --- a/CMakeModules/CalamaresAddTranslations.cmake +++ b/CMakeModules/CalamaresAddTranslations.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### diff --git a/CMakeModules/CalamaresAutomoc.cmake b/CMakeModules/CalamaresAutomoc.cmake index f8aa7faef..3de586ad2 100644 --- a/CMakeModules/CalamaresAutomoc.cmake +++ b/CMakeModules/CalamaresAutomoc.cmake @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . # -# SPDX-License-Identifier: GPL-3.0+ +# SPDX-License-Identifier: GPL-3.0-or-later # License-Filename: LICENSE # ### From 741b6805135235c0ed563bbcc90a9e6ba8930cb6 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Fri, 29 May 2020 22:09:39 +0100 Subject: [PATCH 4/7] [qml] Update SPDX identifiers. Update Presentation.qml --- src/qml/calamares/slideshow/Presentation.qml | 2 +- src/qml/calamares/slideshow/Slide.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/calamares/slideshow/Presentation.qml b/src/qml/calamares/slideshow/Presentation.qml index 1d2fd9c85..405055b56 100644 --- a/src/qml/calamares/slideshow/Presentation.qml +++ b/src/qml/calamares/slideshow/Presentation.qml @@ -12,7 +12,7 @@ * - Support "V2" loading * - Disable shortcuts until the content is visible in Calamares * - * SPDX-License-Identifier: LGPL-2.1 + * SPDX-License-Identifier: LGPL-2.1-only * License-Filename: LICENSES/LGPLv2.1-Presentation */ diff --git a/src/qml/calamares/slideshow/Slide.qml b/src/qml/calamares/slideshow/Slide.qml index 6b32ddfbf..dc3e24480 100644 --- a/src/qml/calamares/slideshow/Slide.qml +++ b/src/qml/calamares/slideshow/Slide.qml @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-License-Identifier: LGPL-2.1 + * SPDX-License-Identifier: LGPL-2.1-only * License-Filename: LICENSES/LGPLv2.1-Presentation */ From 210ce97bf65eec13cde73c4b6741a3d8471fd95f Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Fri, 29 May 2020 22:11:24 +0100 Subject: [PATCH 5/7] [libcalamaresui] Update SPDX identifiers. Update ImageRegistry.cpp --- src/libcalamaresui/utils/ImageRegistry.cpp | 2 +- src/libcalamaresui/utils/ImageRegistry.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp index 1778de745..ebe6858dd 100644 --- a/src/libcalamaresui/utils/ImageRegistry.cpp +++ b/src/libcalamaresui/utils/ImageRegistry.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-License-Identifier: GPLv3+ + * SPDX-License-Identifier: GPL-3.0-or-later * License-Filename: LICENSES/GPLv3+-ImageRegistry * * Copyright 2019, Adriaan de Groot diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h index f73ee36e6..5378d71e7 100644 --- a/src/libcalamaresui/utils/ImageRegistry.h +++ b/src/libcalamaresui/utils/ImageRegistry.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-License-Identifier: GPLv3+ + * SPDX-License-Identifier: GPL-3.0-or-later * License-Filename: LICENSES/GPLv3+-ImageRegistry * * Copyright 2019, Adriaan de Groot From 141842dfd26bd641d5d8ff006fa3d2c4e59a1091 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sun, 31 May 2020 14:07:49 +0100 Subject: [PATCH 6/7] [LICENSES] Add BSD2 --- LICENSES/BSD2 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 LICENSES/BSD2 diff --git a/LICENSES/BSD2 b/LICENSES/BSD2 new file mode 100644 index 000000000..919d22d1c --- /dev/null +++ b/LICENSES/BSD2 @@ -0,0 +1,24 @@ + + Copyright 2019 Adriaan de Groot + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. From 0c4dc71d5c4e4c05ad6b2c668f5045652772af1e Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sat, 30 May 2020 15:15:03 +0100 Subject: [PATCH 7/7] [libcalamares] Update SPDX identifiers. Update CppJob.h Update CalamaresConfig.h.in Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.cpp Update CalamaresConfig.h.in Update CppJob.cpp Update CppJob.h Update DllMacro.h Update GlobalStorage.cpp Update GlobalStorage.h Update Job.cpp Update Job.h Update JobExample.cpp Update JobExample.h Update JobQueue.h Update ProcessJob.cpp Update ProcessJob.h Update PythonHelper.cpp Update PythonJob.cpp Update PythonJob.h Update PythonHelper.h Update PythonJobApi.cpp Update PythonJobApi.h Update Settings.cpp Update Settings.h Update GeoIPJSON.cpp Update GeoIPJSON.h Update GeoIPTests.cpp Update GeoIPTests.h Update GeoIPXML.cpp Update GeoIPXML.h Update Handler.cpp Update Handler.h Update Interface.cpp Update Interface.h Update test_geoip.cpp Update CountryData_p.cpp Update Label.cpp Update Label.h Update LabelModel.cpp Update LabelModel.h Update CountryData_p.cpp Update CountryData_p.cpp Update Lookup.cpp Update Lookup.h Update Tests.cpp Update Tests.h Update TimeZone.cpp Update TimeZone.h Update TranslatableConfiguration.cpp Update TranslatableConfiguration.h Update ZoneData_p.cxxtr Update cldr-extractor.py Update zone-extractor.py Update Actions.h Update Actions.h Update Descriptor.h Update InstanceKey.cpp Update Module.cpp Update Module.h Update Requirement.cpp Update RequirementsChecker.h Update RequirementsModel.cpp Update RequirementsModel.h Update Tests.cpp Update Manager.cpp Update Manager.h Update Tests.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update KPMTests.cpp Update FileSystem.cpp Update FileSystem.cpp Update FileSystem.h Update KPMManager.cpp Update KPMManager.h Update Mount.cpp Update Mount.h Update PartitionIterator.cpp Update PartitionIterator.h Update PartitionIterator.h Update PartitionQuery.cpp Update PartitionQuery.h Update PartitionSize.cpp Update PartitionSize.h Update Sync.cpp Update Sync.h Update Tests.cpp Update Tests.h Update BoostPython.h Update CalamaresUtilsSystem.cpp Update CalamaresUtilsSystem.h Update CommandList.cpp Update CommandList.h Update Dirs.cpp Update Dirs.h Update Entropy.cpp Update Entropy.h Update Entropy.cpp Update Logger.cpp Update Logger.h Update NamedEnum.h Update NamedSuffix.h Update PluginFactory.cpp Update PluginFactory.h Update RAII.h Update RAII.h Update Retranslator.cpp Update Retranslator.h Update String.cpp Update String.h Update TestPaths.cpp Update Tests.cpp Update Tests.h Update UMask.cpp Update UMask.h Update Units.h Update Variant.cpp Update Variant.h Update Yaml.cpp Update Yaml.h Update moc-warnings.h --- src/libcalamares/CMakeLists.txt | 21 ++++++++++++++++++ src/libcalamares/CalamaresConfig.h.in | 21 ++++++++++++++++++ src/libcalamares/CppJob.cpp | 10 ++++++--- src/libcalamares/CppJob.h | 12 ++++++---- src/libcalamares/DllMacro.h | 10 ++++++--- src/libcalamares/GlobalStorage.cpp | 10 ++++++--- src/libcalamares/GlobalStorage.h | 10 ++++++--- src/libcalamares/Job.cpp | 8 +++++-- src/libcalamares/Job.h | 9 +++++--- src/libcalamares/JobExample.cpp | 9 +++++--- src/libcalamares/JobExample.h | 8 +++++-- src/libcalamares/JobQueue.cpp | 10 ++++++--- src/libcalamares/JobQueue.h | 8 +++++-- src/libcalamares/ProcessJob.cpp | 10 ++++++--- src/libcalamares/ProcessJob.h | 10 ++++++--- src/libcalamares/PythonHelper.cpp | 10 ++++++--- src/libcalamares/PythonHelper.h | 10 ++++++--- src/libcalamares/PythonJob.cpp | 11 ++++++---- src/libcalamares/PythonJob.h | 10 ++++++--- src/libcalamares/PythonJobApi.cpp | 10 ++++++--- src/libcalamares/PythonJobApi.h | 10 ++++++--- src/libcalamares/Settings.cpp | 14 +++++++----- src/libcalamares/Settings.h | 14 +++++++----- src/libcalamares/geoip/GeoIPJSON.cpp | 12 ++++++---- src/libcalamares/geoip/GeoIPJSON.h | 10 ++++++--- src/libcalamares/geoip/GeoIPTests.cpp | 10 ++++++--- src/libcalamares/geoip/GeoIPTests.h | 10 ++++++--- src/libcalamares/geoip/GeoIPXML.cpp | 10 ++++++--- src/libcalamares/geoip/GeoIPXML.h | 10 ++++++--- src/libcalamares/geoip/Handler.cpp | 10 ++++++--- src/libcalamares/geoip/Handler.h | 10 ++++++--- src/libcalamares/geoip/Interface.cpp | 10 ++++++--- src/libcalamares/geoip/Interface.h | 10 ++++++--- src/libcalamares/geoip/test_geoip.cpp | 10 ++++++--- src/libcalamares/locale/Label.cpp | 10 ++++++--- src/libcalamares/locale/Label.h | 10 ++++++--- src/libcalamares/locale/LabelModel.cpp | 10 ++++++--- src/libcalamares/locale/LabelModel.h | 10 ++++++--- src/libcalamares/locale/Lookup.cpp | 8 +++++-- src/libcalamares/locale/Lookup.h | 8 +++++-- src/libcalamares/locale/Tests.cpp | 8 +++++-- src/libcalamares/locale/Tests.h | 8 +++++-- src/libcalamares/locale/TimeZone.cpp | 8 +++++-- src/libcalamares/locale/TimeZone.h | 8 +++++-- .../locale/TranslatableConfiguration.cpp | 8 +++++-- .../locale/TranslatableConfiguration.h | 8 +++++-- src/libcalamares/locale/ZoneData_p.cxxtr | 20 +++++++++++++++++ src/libcalamares/locale/cldr-extractor.py | 7 ++++++ src/libcalamares/locale/zone-extractor.py | 6 +++++ src/libcalamares/modulesystem/Actions.h | 10 ++++++--- src/libcalamares/modulesystem/Descriptor.h | 8 +++++-- src/libcalamares/modulesystem/InstanceKey.cpp | 10 ++++++--- src/libcalamares/modulesystem/InstanceKey.h | 10 ++++++--- src/libcalamares/modulesystem/Module.cpp | 10 ++++++--- src/libcalamares/modulesystem/Module.h | 10 ++++++--- src/libcalamares/modulesystem/Requirement.cpp | 10 ++++++--- src/libcalamares/modulesystem/Requirement.h | 10 ++++++--- .../modulesystem/RequirementsChecker.cpp | 10 ++++++--- .../modulesystem/RequirementsChecker.h | 10 ++++++--- .../modulesystem/RequirementsModel.cpp | 8 +++++-- .../modulesystem/RequirementsModel.h | 8 +++++-- src/libcalamares/modulesystem/Tests.cpp | 8 +++++-- src/libcalamares/network/Manager.cpp | 8 +++++-- src/libcalamares/network/Manager.h | 8 +++++-- src/libcalamares/network/Tests.cpp | 8 +++++-- src/libcalamares/network/Tests.h | 8 +++++-- src/libcalamares/partition/FileSystem.cpp | 12 ++++++---- src/libcalamares/partition/FileSystem.h | 12 ++++++---- src/libcalamares/partition/KPMManager.cpp | 8 +++++-- src/libcalamares/partition/KPMManager.h | 8 +++++-- src/libcalamares/partition/KPMTests.cpp | 8 +++++-- src/libcalamares/partition/Mount.cpp | 10 ++++++--- src/libcalamares/partition/Mount.h | 10 ++++++--- .../partition/PartitionIterator.cpp | 12 ++++++---- .../partition/PartitionIterator.h | 13 +++++++---- src/libcalamares/partition/PartitionQuery.cpp | 12 ++++++---- src/libcalamares/partition/PartitionQuery.h | 12 ++++++---- src/libcalamares/partition/PartitionSize.cpp | 11 +++++++--- src/libcalamares/partition/PartitionSize.h | 10 ++++++--- src/libcalamares/partition/Sync.cpp | 8 +++++-- src/libcalamares/partition/Sync.h | 8 +++++-- src/libcalamares/partition/Tests.cpp | 8 +++++-- src/libcalamares/partition/Tests.h | 8 +++++-- src/libcalamares/utils/BoostPython.h | 8 +++++-- .../utils/CalamaresUtilsSystem.cpp | 10 ++++++--- src/libcalamares/utils/CalamaresUtilsSystem.h | 10 ++++++--- src/libcalamares/utils/CommandList.cpp | 8 +++++-- src/libcalamares/utils/CommandList.h | 8 +++++-- src/libcalamares/utils/Dirs.cpp | 16 +++++++++----- src/libcalamares/utils/Dirs.h | 16 +++++++++----- src/libcalamares/utils/Entropy.cpp | 7 +++++- src/libcalamares/utils/Entropy.h | 7 +++++- src/libcalamares/utils/Logger.cpp | 13 +++++++---- src/libcalamares/utils/Logger.h | 14 +++++++----- src/libcalamares/utils/NamedEnum.h | 10 ++++++--- src/libcalamares/utils/NamedSuffix.h | 8 +++++-- src/libcalamares/utils/PluginFactory.cpp | 18 ++++++++++++++- src/libcalamares/utils/PluginFactory.h | 16 +++++++++----- src/libcalamares/utils/RAII.h | 8 +++++-- src/libcalamares/utils/Retranslator.cpp | 8 +++++-- src/libcalamares/utils/Retranslator.h | 8 +++++-- src/libcalamares/utils/String.cpp | 16 +++++++++----- src/libcalamares/utils/String.h | 16 +++++++++----- src/libcalamares/utils/TestPaths.cpp | 7 +++++- src/libcalamares/utils/Tests.cpp | 7 +++++- src/libcalamares/utils/Tests.h | 7 +++++- src/libcalamares/utils/UMask.cpp | 7 +++++- src/libcalamares/utils/UMask.h | 8 +++++-- src/libcalamares/utils/Units.h | 9 ++++++-- src/libcalamares/utils/Variant.cpp | 16 +++++++++----- src/libcalamares/utils/Variant.h | 9 ++++++-- src/libcalamares/utils/Yaml.cpp | 9 ++++++-- src/libcalamares/utils/Yaml.h | 9 ++++++-- src/libcalamares/utils/moc-warnings.h | 22 +++++++++++++++++++ 114 files changed, 857 insertions(+), 306 deletions(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index fa4265d6e..560ea597e 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -1,3 +1,24 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2020 Adriaan de Groot +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with Calamares. If not, see . +# +# SPDX-License-Identifier: GPL-3.0-or-later +# License-Filename: LICENSE +# +# # libcalamares is the non-GUI part of Calamares, which includes handling # translations, configurations, logging, utilities, global storage, and (non-GUI) jobs. diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in index b31de95b5..98efa8c26 100644 --- a/src/libcalamares/CalamaresConfig.h.in +++ b/src/libcalamares/CalamaresConfig.h.in @@ -1,3 +1,24 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * + */ #ifndef CALAMARESCONFIG_H #define CALAMARESCONFIG_H diff --git a/src/libcalamares/CppJob.cpp b/src/libcalamares/CppJob.cpp index b6b18b1b7..a2647463a 100644 --- a/src/libcalamares/CppJob.cpp +++ b/src/libcalamares/CppJob.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2016, Kevin Kofler + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2016 Kevin Kofler * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "CppJob.h" diff --git a/src/libcalamares/CppJob.h b/src/libcalamares/CppJob.h index e4997733e..ee093675a 100644 --- a/src/libcalamares/CppJob.h +++ b/src/libcalamares/CppJob.h @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2016, Kevin Kofler - * Copyright 2020, Adriaan de Groor + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2016 Kevin Kofler + * SPDX-FileCopyrightText: 2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_CPPJOB_H diff --git a/src/libcalamares/DllMacro.h b/src/libcalamares/DllMacro.h index 528a70c2d..2eeea331e 100644 --- a/src/libcalamares/DllMacro.h +++ b/src/libcalamares/DllMacro.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef DLLMACRO_H diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp index 428b01103..d58a3b0c6 100644 --- a/src/libcalamares/GlobalStorage.cpp +++ b/src/libcalamares/GlobalStorage.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "GlobalStorage.h" diff --git a/src/libcalamares/GlobalStorage.h b/src/libcalamares/GlobalStorage.h index 2a59009f7..e9ba1da8a 100644 --- a/src/libcalamares/GlobalStorage.h +++ b/src/libcalamares/GlobalStorage.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_GLOBALSTORAGE_H diff --git a/src/libcalamares/Job.cpp b/src/libcalamares/Job.cpp index d074a18cb..95339f349 100644 --- a/src/libcalamares/Job.cpp +++ b/src/libcalamares/Job.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Job.h" diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index d93e97cf7..18f11158f 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,11 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ - #ifndef CALAMARES_JOB_H #define CALAMARES_JOB_H diff --git a/src/libcalamares/JobExample.cpp b/src/libcalamares/JobExample.cpp index 83da2b1e1..ba085be6e 100644 --- a/src/libcalamares/JobExample.cpp +++ b/src/libcalamares/JobExample.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,11 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ - #include "JobExample.h" namespace Calamares diff --git a/src/libcalamares/JobExample.h b/src/libcalamares/JobExample.h index 92f8f8fb6..e0307f64a 100644 --- a/src/libcalamares/JobExample.h +++ b/src/libcalamares/JobExample.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_JOB_EXAMPLE_H diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 6a2aa4cba..adff9464b 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "JobQueue.h" diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h index 88a2bb0c3..ff2694d8f 100644 --- a/src/libcalamares/JobQueue.h +++ b/src/libcalamares/JobQueue.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_JOBQUEUE_H diff --git a/src/libcalamares/ProcessJob.cpp b/src/libcalamares/ProcessJob.cpp index 744f5f9bf..c6cb94359 100644 --- a/src/libcalamares/ProcessJob.cpp +++ b/src/libcalamares/ProcessJob.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "ProcessJob.h" diff --git a/src/libcalamares/ProcessJob.h b/src/libcalamares/ProcessJob.h index e826acb1d..75ef6f6e3 100644 --- a/src/libcalamares/ProcessJob.h +++ b/src/libcalamares/ProcessJob.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_PROCESSJOB_H diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index 0b5d77ac1..2f5418888 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "PythonHelper.h" diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h index 7528732a0..7acea5832 100644 --- a/src/libcalamares/PythonHelper.h +++ b/src/libcalamares/PythonHelper.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_PYTHONJOBHELPER_H diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 9069c49dc..50828e896 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,8 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ - #include "PythonJob.h" #include "CalamaresVersion.h" diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h index eb9d8fff1..498eac44f 100644 --- a/src/libcalamares/PythonJob.h +++ b/src/libcalamares/PythonJob.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_PYTHONJOB_H diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index ecca466fe..2f8818738 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2017-2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "PythonJobApi.h" diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h index f91572b3d..6fd162912 100644 --- a/src/libcalamares/PythonJobApi.h +++ b/src/libcalamares/PythonJobApi.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2017-2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef PYTHONJOBAPI_H diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index da388ea32..3c45c2e43 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -1,9 +1,9 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Dominic Hayes - * Copyright 2019, Gabriel Craciunescu - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Gabriel Craciunescu + * SPDX-FileCopyrightText: 2019 Dominic Hayes + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Settings.h" diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 3cedd6e2b..098e010e5 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -1,9 +1,9 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Dominic Hayes - * Copyright 2019, Gabriel Craciunescu - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Gabriel Craciunescu + * SPDX-FileCopyrightText: 2019 Dominic Hayes + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef SETTINGS_H diff --git a/src/libcalamares/geoip/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp index 85dc79619..6522ca085 100644 --- a/src/libcalamares/geoip/GeoIPJSON.cpp +++ b/src/libcalamares/geoip/GeoIPJSON.cpp @@ -1,7 +1,7 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "GeoIPJSON.h" diff --git a/src/libcalamares/geoip/GeoIPJSON.h b/src/libcalamares/geoip/GeoIPJSON.h index 3f7756dd8..246556c74 100644 --- a/src/libcalamares/geoip/GeoIPJSON.h +++ b/src/libcalamares/geoip/GeoIPJSON.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018-2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef GEOIP_GEOIPJSON_H diff --git a/src/libcalamares/geoip/GeoIPTests.cpp b/src/libcalamares/geoip/GeoIPTests.cpp index 4b1f8f8e1..1ef03196e 100644 --- a/src/libcalamares/geoip/GeoIPTests.cpp +++ b/src/libcalamares/geoip/GeoIPTests.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "GeoIPTests.h" diff --git a/src/libcalamares/geoip/GeoIPTests.h b/src/libcalamares/geoip/GeoIPTests.h index a320e3263..795dbfe89 100644 --- a/src/libcalamares/geoip/GeoIPTests.h +++ b/src/libcalamares/geoip/GeoIPTests.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef GEOIPTESTS_H diff --git a/src/libcalamares/geoip/GeoIPXML.cpp b/src/libcalamares/geoip/GeoIPXML.cpp index 2a97c5546..125614032 100644 --- a/src/libcalamares/geoip/GeoIPXML.cpp +++ b/src/libcalamares/geoip/GeoIPXML.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "GeoIPXML.h" diff --git a/src/libcalamares/geoip/GeoIPXML.h b/src/libcalamares/geoip/GeoIPXML.h index 73147ff91..d686928db 100644 --- a/src/libcalamares/geoip/GeoIPXML.h +++ b/src/libcalamares/geoip/GeoIPXML.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018-2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef GEOIP_GEOIPXML_H diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp index 99e55e926..107c4d1ea 100644 --- a/src/libcalamares/geoip/Handler.cpp +++ b/src/libcalamares/geoip/Handler.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Handler.h" diff --git a/src/libcalamares/geoip/Handler.h b/src/libcalamares/geoip/Handler.h index 518964caf..6e4f590c7 100644 --- a/src/libcalamares/geoip/Handler.h +++ b/src/libcalamares/geoip/Handler.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef GEOIP_HANDLER_H diff --git a/src/libcalamares/geoip/Interface.cpp b/src/libcalamares/geoip/Interface.cpp index 2cecb63c5..82acb7950 100644 --- a/src/libcalamares/geoip/Interface.cpp +++ b/src/libcalamares/geoip/Interface.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Interface.h" diff --git a/src/libcalamares/geoip/Interface.h b/src/libcalamares/geoip/Interface.h index 1a9beaa41..d22f07788 100644 --- a/src/libcalamares/geoip/Interface.h +++ b/src/libcalamares/geoip/Interface.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018-2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef GEOIP_INTERFACE_H diff --git a/src/libcalamares/geoip/test_geoip.cpp b/src/libcalamares/geoip/test_geoip.cpp index 32c6f4e24..d5f386d02 100644 --- a/src/libcalamares/geoip/test_geoip.cpp +++ b/src/libcalamares/geoip/test_geoip.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /** diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp index 02583df8b..0be82a380 100644 --- a/src/libcalamares/locale/Label.cpp +++ b/src/libcalamares/locale/Label.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Label.h" diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Label.h index bd596f53d..fa07e3361 100644 --- a/src/libcalamares/locale/Label.h +++ b/src/libcalamares/locale/Label.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LOCALE_LABEL_H diff --git a/src/libcalamares/locale/LabelModel.cpp b/src/libcalamares/locale/LabelModel.cpp index da4e1a9f7..a7f14bf50 100644 --- a/src/libcalamares/locale/LabelModel.cpp +++ b/src/libcalamares/locale/LabelModel.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020 Adriaan de Groot - * Copyright 2019, Camilo Higuita + * + * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "LabelModel.h" diff --git a/src/libcalamares/locale/LabelModel.h b/src/libcalamares/locale/LabelModel.h index 7bd1fad67..000bf4da7 100644 --- a/src/libcalamares/locale/LabelModel.h +++ b/src/libcalamares/locale/LabelModel.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020, Adriaan de Groot - * Copyright 2019, Camilo Higuita + * + * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LOCALE_LABELMODEL_H diff --git a/src/libcalamares/locale/Lookup.cpp b/src/libcalamares/locale/Lookup.cpp index baa3ce5b1..615783a87 100644 --- a/src/libcalamares/locale/Lookup.cpp +++ b/src/libcalamares/locale/Lookup.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Lookup.h" diff --git a/src/libcalamares/locale/Lookup.h b/src/libcalamares/locale/Lookup.h index abcee0ed3..daa9c2987 100644 --- a/src/libcalamares/locale/Lookup.h +++ b/src/libcalamares/locale/Lookup.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LOCALE_LOOKUP_H diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp index 6cbe980be..6c5a508d7 100644 --- a/src/libcalamares/locale/Tests.cpp +++ b/src/libcalamares/locale/Tests.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Tests.h" diff --git a/src/libcalamares/locale/Tests.h b/src/libcalamares/locale/Tests.h index 96ee48b0b..dfe85a865 100644 --- a/src/libcalamares/locale/Tests.h +++ b/src/libcalamares/locale/Tests.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LIBCALAMARES_LOCALE_TESTS_H diff --git a/src/libcalamares/locale/TimeZone.cpp b/src/libcalamares/locale/TimeZone.cpp index e25cf2144..0c13a8c77 100644 --- a/src/libcalamares/locale/TimeZone.cpp +++ b/src/libcalamares/locale/TimeZone.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "TimeZone.h" diff --git a/src/libcalamares/locale/TimeZone.h b/src/libcalamares/locale/TimeZone.h index 5f1e19801..60900ef21 100644 --- a/src/libcalamares/locale/TimeZone.h +++ b/src/libcalamares/locale/TimeZone.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LOCALE_TIMEZONE_H diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp index 83199a4cc..fb9800d64 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.cpp +++ b/src/libcalamares/locale/TranslatableConfiguration.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "TranslatableConfiguration.h" diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h index d845569bc..fa6016731 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.h +++ b/src/libcalamares/locale/TranslatableConfiguration.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LOCALE_TRANSLATABLECONFIGURATION_H diff --git a/src/libcalamares/locale/ZoneData_p.cxxtr b/src/libcalamares/locale/ZoneData_p.cxxtr index b73d17ad3..4bfef3c0c 100644 --- a/src/libcalamares/locale/ZoneData_p.cxxtr +++ b/src/libcalamares/locale/ZoneData_p.cxxtr @@ -1,6 +1,26 @@ /* GENERATED FILE DO NOT EDIT * * === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * + * * * This file is derived from zone.tab, which has its own copyright statement: * diff --git a/src/libcalamares/locale/cldr-extractor.py b/src/libcalamares/locale/cldr-extractor.py index aae71ed1d..f69407257 100644 --- a/src/libcalamares/locale/cldr-extractor.py +++ b/src/libcalamares/locale/cldr-extractor.py @@ -1,6 +1,13 @@ #! /usr/bin/env python3 # # === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2019 Adriaan de Groot +# +# SPDX-License-Identifier: BSD-2-Clause +# License-Filename: LICENSES/BSD2 +# +# # # Python3 script to scrape some data out of ICU CLDR supplemental data. # diff --git a/src/libcalamares/locale/zone-extractor.py b/src/libcalamares/locale/zone-extractor.py index 92165d824..8ff1b5ef7 100644 --- a/src/libcalamares/locale/zone-extractor.py +++ b/src/libcalamares/locale/zone-extractor.py @@ -1,6 +1,12 @@ #! /usr/bin/env python3 # # === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2019 Adriaan de Groot +# +# SPDX-License-Identifier: BSD-2-Clause +# License-Filename: LICENSES/BSD2 +# # # Python3 script to scrape some data out of zoneinfo/zone.tab. # diff --git a/src/libcalamares/modulesystem/Actions.h b/src/libcalamares/modulesystem/Actions.h index e1be0b867..0b7133f78 100644 --- a/src/libcalamares/modulesystem/Actions.h +++ b/src/libcalamares/modulesystem/Actions.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef MODULESYSTEM_ACTIONS_H diff --git a/src/libcalamares/modulesystem/Descriptor.h b/src/libcalamares/modulesystem/Descriptor.h index 77d69caf3..b34f163ad 100644 --- a/src/libcalamares/modulesystem/Descriptor.h +++ b/src/libcalamares/modulesystem/Descriptor.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef MODULESYSTEM_DESCRIPTOR_H diff --git a/src/libcalamares/modulesystem/InstanceKey.cpp b/src/libcalamares/modulesystem/InstanceKey.cpp index cde921b40..82ccf7800 100644 --- a/src/libcalamares/modulesystem/InstanceKey.cpp +++ b/src/libcalamares/modulesystem/InstanceKey.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2018-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "InstanceKey.h" diff --git a/src/libcalamares/modulesystem/InstanceKey.h b/src/libcalamares/modulesystem/InstanceKey.h index 724827330..c81d83a75 100644 --- a/src/libcalamares/modulesystem/InstanceKey.h +++ b/src/libcalamares/modulesystem/InstanceKey.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2018-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef MODULESYSTEM_INSTANCEKEY_H #define MODULESYSTEM_INSTANCEKEY_H diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp index 9620299ec..407a10205 100644 --- a/src/libcalamares/modulesystem/Module.cpp +++ b/src/libcalamares/modulesystem/Module.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Module.h" diff --git a/src/libcalamares/modulesystem/Module.h b/src/libcalamares/modulesystem/Module.h index ba4533fae..81737cf8f 100644 --- a/src/libcalamares/modulesystem/Module.h +++ b/src/libcalamares/modulesystem/Module.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * Copyright 2017, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_MODULE_H diff --git a/src/libcalamares/modulesystem/Requirement.cpp b/src/libcalamares/modulesystem/Requirement.cpp index e4525e8d6..d5ba23282 100644 --- a/src/libcalamares/modulesystem/Requirement.cpp +++ b/src/libcalamares/modulesystem/Requirement.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2017, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2017 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,5 +14,9 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Requirement.h" diff --git a/src/libcalamares/modulesystem/Requirement.h b/src/libcalamares/modulesystem/Requirement.h index da3cf29dd..eb664d2a9 100644 --- a/src/libcalamares/modulesystem/Requirement.h +++ b/src/libcalamares/modulesystem/Requirement.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2017, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2017 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_REQUIREMENT_H #define CALAMARES_REQUIREMENT_H diff --git a/src/libcalamares/modulesystem/RequirementsChecker.cpp b/src/libcalamares/modulesystem/RequirementsChecker.cpp index d59ccb602..2dbaea8cf 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.cpp +++ b/src/libcalamares/modulesystem/RequirementsChecker.cpp @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "RequirementsChecker.h" diff --git a/src/libcalamares/modulesystem/RequirementsChecker.h b/src/libcalamares/modulesystem/RequirementsChecker.h index 21c86f0a6..910e34dfc 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.h +++ b/src/libcalamares/modulesystem/RequirementsChecker.h @@ -1,6 +1,6 @@ -/* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_REQUIREMENTSCHECKER_H #define CALAMARES_REQUIREMENTSCHECKER_H diff --git a/src/libcalamares/modulesystem/RequirementsModel.cpp b/src/libcalamares/modulesystem/RequirementsModel.cpp index eed3b8b3b..6f9fc1e7b 100644 --- a/src/libcalamares/modulesystem/RequirementsModel.cpp +++ b/src/libcalamares/modulesystem/RequirementsModel.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "RequirementsModel.h" diff --git a/src/libcalamares/modulesystem/RequirementsModel.h b/src/libcalamares/modulesystem/RequirementsModel.h index 2318421c4..df56ccd7b 100644 --- a/src/libcalamares/modulesystem/RequirementsModel.h +++ b/src/libcalamares/modulesystem/RequirementsModel.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef CALAMARES_REQUIREMENTSMODEL_H diff --git a/src/libcalamares/modulesystem/Tests.cpp b/src/libcalamares/modulesystem/Tests.cpp index b1fab7ffc..7973cc0ad 100644 --- a/src/libcalamares/modulesystem/Tests.cpp +++ b/src/libcalamares/modulesystem/Tests.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "modulesystem/InstanceKey.h" diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp index 9e76d5ff0..d70988a0a 100644 --- a/src/libcalamares/network/Manager.cpp +++ b/src/libcalamares/network/Manager.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Manager.h" diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h index 0837bdc13..1ba3eb411 100644 --- a/src/libcalamares/network/Manager.h +++ b/src/libcalamares/network/Manager.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LIBCALAMARES_NETWORK_MANAGER_H diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp index e21a03bab..6841a3061 100644 --- a/src/libcalamares/network/Tests.cpp +++ b/src/libcalamares/network/Tests.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Tests.h" diff --git a/src/libcalamares/network/Tests.h b/src/libcalamares/network/Tests.h index b63f7eff0..2d785672e 100644 --- a/src/libcalamares/network/Tests.h +++ b/src/libcalamares/network/Tests.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LIBCALAMARES_NETWORK_TESTS_H diff --git a/src/libcalamares/partition/FileSystem.cpp b/src/libcalamares/partition/FileSystem.cpp index fbbe48581..965a1a8af 100644 --- a/src/libcalamares/partition/FileSystem.cpp +++ b/src/libcalamares/partition/FileSystem.cpp @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015-2016, Teo Mrnjavac - * Copyright 2018-2019 Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "FileSystem.h" diff --git a/src/libcalamares/partition/FileSystem.h b/src/libcalamares/partition/FileSystem.h index 258515d3c..a683aab47 100644 --- a/src/libcalamares/partition/FileSystem.h +++ b/src/libcalamares/partition/FileSystem.h @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015-2016, Teo Mrnjavac - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /* diff --git a/src/libcalamares/partition/KPMManager.cpp b/src/libcalamares/partition/KPMManager.cpp index efc5f0003..964b87859 100644 --- a/src/libcalamares/partition/KPMManager.cpp +++ b/src/libcalamares/partition/KPMManager.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "KPMManager.h" diff --git a/src/libcalamares/partition/KPMManager.h b/src/libcalamares/partition/KPMManager.h index 5f7039221..be5ae00c0 100644 --- a/src/libcalamares/partition/KPMManager.h +++ b/src/libcalamares/partition/KPMManager.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /* diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp index 7468d3938..0bdb29a15 100644 --- a/src/libcalamares/partition/KPMTests.cpp +++ b/src/libcalamares/partition/KPMTests.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "utils/Logger.h" diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp index 2bb49b0cb..f9a45fafd 100644 --- a/src/libcalamares/partition/Mount.cpp +++ b/src/libcalamares/partition/Mount.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Mount.h" diff --git a/src/libcalamares/partition/Mount.h b/src/libcalamares/partition/Mount.h index 041e7e757..c08d5ac75 100644 --- a/src/libcalamares/partition/Mount.h +++ b/src/libcalamares/partition/Mount.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef PARTITION_MOUNT_H diff --git a/src/libcalamares/partition/PartitionIterator.cpp b/src/libcalamares/partition/PartitionIterator.cpp index 642752163..f4e57fbad 100644 --- a/src/libcalamares/partition/PartitionIterator.cpp +++ b/src/libcalamares/partition/PartitionIterator.cpp @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015, Teo Mrnjavac - * Copyright 2017, 2019 Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "PartitionIterator.h" diff --git a/src/libcalamares/partition/PartitionIterator.h b/src/libcalamares/partition/PartitionIterator.h index 78d930cf4..03a03faba 100644 --- a/src/libcalamares/partition/PartitionIterator.h +++ b/src/libcalamares/partition/PartitionIterator.h @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015, Teo Mrnjavac - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,8 +16,13 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ + /* * NOTE: this functionality is only available when Calamares is compiled * with KPMcore support. diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp index 6693f7e6c..0aba728b3 100644 --- a/src/libcalamares/partition/PartitionQuery.cpp +++ b/src/libcalamares/partition/PartitionQuery.cpp @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015-2016, Teo Mrnjavac - * Copyright 2018-2019 Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "PartitionQuery.h" diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h index 18eb7edd2..595d82c0f 100644 --- a/src/libcalamares/partition/PartitionQuery.h +++ b/src/libcalamares/partition/PartitionQuery.h @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Aurélien Gâteau - * Copyright 2015-2016, Teo Mrnjavac - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Aurélien Gâteau + * SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /* diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp index fc8d72582..d84fd81c6 100644 --- a/src/libcalamares/partition/PartitionSize.cpp +++ b/src/libcalamares/partition/PartitionSize.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Collabora Ltd - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Collabora Ltd + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,8 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ + #include "partition/PartitionSize.h" #include "utils/Logger.h" #include "utils/Units.h" diff --git a/src/libcalamares/partition/PartitionSize.h b/src/libcalamares/partition/PartitionSize.h index b22698e55..f70aa3c89 100644 --- a/src/libcalamares/partition/PartitionSize.h +++ b/src/libcalamares/partition/PartitionSize.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Collabora Ltd - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Collabora Ltd + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef PARTITION_PARTITIONSIZE_H diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp index c71c6a172..d1f6378cd 100644 --- a/src/libcalamares/partition/Sync.cpp +++ b/src/libcalamares/partition/Sync.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Sync.h" diff --git a/src/libcalamares/partition/Sync.h b/src/libcalamares/partition/Sync.h index 510858500..a291058e7 100644 --- a/src/libcalamares/partition/Sync.h +++ b/src/libcalamares/partition/Sync.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef PARTITION_SYNC_H diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index 0800fa455..7719f2e84 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Tests.h" diff --git a/src/libcalamares/partition/Tests.h b/src/libcalamares/partition/Tests.h index 799f50c04..c495fa0fd 100644 --- a/src/libcalamares/partition/Tests.h +++ b/src/libcalamares/partition/Tests.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef LIBCALAMARES_PARTITION_TESTS_H diff --git a/src/libcalamares/utils/BoostPython.h b/src/libcalamares/utils/BoostPython.h index 7bd8865da..a1986a7c2 100644 --- a/src/libcalamares/utils/BoostPython.h +++ b/src/libcalamares/utils/BoostPython.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019-2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /* diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 327bece92..955358774 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "CalamaresUtilsSystem.h" diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index c4db9dc00..d6adead60 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2018, 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_CALAMARESUTILSSYSTEM_H #define UTILS_CALAMARESUTILSSYSTEM_H diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp index 8a2f3835b..331d10e34 100644 --- a/src/libcalamares/utils/CommandList.cpp +++ b/src/libcalamares/utils/CommandList.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "CommandList.h" diff --git a/src/libcalamares/utils/CommandList.h b/src/libcalamares/utils/CommandList.h index 71a5a483c..657570563 100644 --- a/src/libcalamares/utils/CommandList.h +++ b/src/libcalamares/utils/CommandList.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_COMMANDLIST_H diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp index bb48477da..290966180 100644 --- a/src/libcalamares/utils/Dirs.cpp +++ b/src/libcalamares/utils/Dirs.cpp @@ -1,12 +1,12 @@ /* === This file is part of Calamares - === - * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Originally from Tomahawk, portions: - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2012, Jeff Mitchell + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2010-2011 Leo Franchi + * SPDX-FileCopyrightText: 2010-2012 Jeff Mitchell * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Dirs.h" diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h index 79c07a957..5a3d48732 100644 --- a/src/libcalamares/utils/Dirs.h +++ b/src/libcalamares/utils/Dirs.h @@ -1,12 +1,12 @@ /* === This file is part of Calamares - === - * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Originally from Tomahawk, portions: - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2012, Jeff Mitchell + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2010-2011 Leo Franchi + * SPDX-FileCopyrightText: 2010-2012 Jeff Mitchell * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_DIRS_H diff --git a/src/libcalamares/utils/Entropy.cpp b/src/libcalamares/utils/Entropy.cpp index ce1f6ba9d..c54b2cf3e 100644 --- a/src/libcalamares/utils/Entropy.cpp +++ b/src/libcalamares/utils/Entropy.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * - * Copyright 2019-2020, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Entropy.h" diff --git a/src/libcalamares/utils/Entropy.h b/src/libcalamares/utils/Entropy.h index 2ab7a609d..3489045ab 100644 --- a/src/libcalamares/utils/Entropy.h +++ b/src/libcalamares/utils/Entropy.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019-2020 Adriaan de Groot * - * Copyright 2019-2020, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_ENTROPY_H diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index ceca20b7a..494b88659 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -1,8 +1,9 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017 Adriaan de Groot * - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,11 +12,15 @@ * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Logger.h" diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 24198e256..69674bc68 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -1,8 +1,8 @@ /* === This file is part of Calamares - === - * - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -11,11 +11,15 @@ * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_LOGGER_H diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h index 76c8ed3bb..1242fc841 100644 --- a/src/libcalamares/utils/NamedEnum.h +++ b/src/libcalamares/utils/NamedEnum.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot - * Copyright 2019, Collabora Ltd + * + * SPDX-FileCopyrightText: 2019 Collabora Ltd + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /** @brief Support for "named" enumerations diff --git a/src/libcalamares/utils/NamedSuffix.h b/src/libcalamares/utils/NamedSuffix.h index 8ad52edea..9efc417e4 100644 --- a/src/libcalamares/utils/NamedSuffix.h +++ b/src/libcalamares/utils/NamedSuffix.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2019, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ /** @brief Support for unit-suffixed values. diff --git a/src/libcalamares/utils/PluginFactory.cpp b/src/libcalamares/utils/PluginFactory.cpp index 50b88ebfd..9f1ab5ae3 100644 --- a/src/libcalamares/utils/PluginFactory.cpp +++ b/src/libcalamares/utils/PluginFactory.cpp @@ -1,6 +1,22 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * - * Copyright 2019, Adriaan de Groot + * 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. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE * */ diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h index 65ee6eee9..68b1b624f 100644 --- a/src/libcalamares/utils/PluginFactory.h +++ b/src/libcalamares/utils/PluginFactory.h @@ -1,11 +1,11 @@ /* === This file is part of Calamares - === - * - * Copyright 2015, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot - * + * + * SPDX-FileCopyrightText: 2015 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot + * * Based on KPluginFactory from KCoreAddons, KDE project - * Copyright 2007, Matthias Kretz - * Copyright 2007, Bernhard Loos + * SPDX-FileCopyrightText: 2007 Matthias Kretz + * SPDX-FileCopyrightText: 2007 Bernhard Loos * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_PLUGINFACTORY_H diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h index 4d8210a25..dae85e84a 100644 --- a/src/libcalamares/utils/RAII.h +++ b/src/libcalamares/utils/RAII.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2020, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_RAII_H diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp index 4cd618d97..03e8a6b4c 100644 --- a/src/libcalamares/utils/Retranslator.cpp +++ b/src/libcalamares/utils/Retranslator.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Retranslator.h" diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h index d62a3b751..8b3719642 100644 --- a/src/libcalamares/utils/Retranslator.h +++ b/src/libcalamares/utils/Retranslator.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac + * + * SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_RETRANSLATOR_H diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index e39132328..35fc692d3 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -1,12 +1,12 @@ /* === This file is part of Calamares - === - * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Originally from Tomahawk, portions: - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2012, Jeff Mitchell + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2010-2011 Leo Franchi + * SPDX-FileCopyrightText: 2010-2012 Jeff Mitchell * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "String.h" diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h index cdf7d0b41..d4bd33357 100644 --- a/src/libcalamares/utils/String.h +++ b/src/libcalamares/utils/String.h @@ -1,12 +1,12 @@ /* === This file is part of Calamares - === - * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Originally from Tomahawk, portions: - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2012, Jeff Mitchell + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2010-2011 Leo Franchi + * SPDX-FileCopyrightText: 2010-2012 Jeff Mitchell * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_STRING_H diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp index 382305ad5..233872324 100644 --- a/src/libcalamares/utils/TestPaths.cpp +++ b/src/libcalamares/utils/TestPaths.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018-2020 Adriaan de Groot * - * Copyright 2018, 2020, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "CalamaresUtilsSystem.h" diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index b529e7149..a1bfcd0ed 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * - * Copyright 2018, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Tests.h" diff --git a/src/libcalamares/utils/Tests.h b/src/libcalamares/utils/Tests.h index 49df8ed74..2e1cba016 100644 --- a/src/libcalamares/utils/Tests.h +++ b/src/libcalamares/utils/Tests.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * - * Copyright 2018, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef TESTS_H diff --git a/src/libcalamares/utils/UMask.cpp b/src/libcalamares/utils/UMask.cpp index 358a52887..a97084215 100644 --- a/src/libcalamares/utils/UMask.cpp +++ b/src/libcalamares/utils/UMask.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * - * Copyright 2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "UMask.h" diff --git a/src/libcalamares/utils/UMask.h b/src/libcalamares/utils/UMask.h index 752c8b066..fe7d2ccb9 100644 --- a/src/libcalamares/utils/UMask.h +++ b/src/libcalamares/utils/UMask.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot * - * Copyright 2019, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +15,11 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ - #ifndef UTILS_UMASK_H #define UTILS_UMASK_H diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h index b869d7dde..899ceca51 100644 --- a/src/libcalamares/utils/Units.h +++ b/src/libcalamares/utils/Units.h @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2017 Adriaan de Groot + * SPDX-FileCopyrightText: 2019 Collabora Ltd * - * Copyright 2017, Adriaan de Groot - * Copyright 2019, Collabora Ltd * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_UNITS_H diff --git a/src/libcalamares/utils/Variant.cpp b/src/libcalamares/utils/Variant.cpp index c56f9301a..cf6ff91fe 100644 --- a/src/libcalamares/utils/Variant.cpp +++ b/src/libcalamares/utils/Variant.cpp @@ -1,12 +1,12 @@ /* === This file is part of Calamares - === - * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * * Originally from Tomahawk, portions: - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2010-2011, Leo Franchi - * Copyright 2010-2012, Jeff Mitchell + * SPDX-FileCopyrightText: 2010-2011 Christian Muehlhaeuser + * SPDX-FileCopyrightText: 2010-2011 Leo Franchi + * SPDX-FileCopyrightText: 2010-2012 Jeff Mitchell * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Variant.h" diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h index 15f791b74..a05d281c3 100644 --- a/src/libcalamares/utils/Variant.h +++ b/src/libcalamares/utils/Variant.h @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac + * SPDX-FileCopyrightText: 2018 Adriaan de Groot * - * Copyright 2013-2016, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_VARIANT_H diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp index b33ca3137..0c7b6787f 100644 --- a/src/libcalamares/utils/Yaml.cpp +++ b/src/libcalamares/utils/Yaml.cpp @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #include "Yaml.h" diff --git a/src/libcalamares/utils/Yaml.h b/src/libcalamares/utils/Yaml.h index a976136e1..c14639447 100644 --- a/src/libcalamares/utils/Yaml.h +++ b/src/libcalamares/utils/Yaml.h @@ -1,7 +1,8 @@ /* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014 Teo Mrnjavac + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * - * Copyright 2014, Teo Mrnjavac - * Copyright 2017-2018, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * */ #ifndef UTILS_YAML_H diff --git a/src/libcalamares/utils/moc-warnings.h b/src/libcalamares/utils/moc-warnings.h index b773c176b..adcdeb873 100644 --- a/src/libcalamares/utils/moc-warnings.h +++ b/src/libcalamares/utils/moc-warnings.h @@ -1,3 +1,25 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + * + * SPDX-License-Identifier: GPL-3.0-or-later + * License-Filename: LICENSE + * + */ #ifdef __clang__ #pragma clang diagnostic ignored "-Wextra-semi-stmt" #pragma clang diagnostic ignored "-Wredundant-parens"