[neon/neon/calamares-settings/Neon/stable] /: further extend spdx coverage
Harald Sitter
null at kde.org
Wed Nov 4 14:50:04 GMT 2020
Git commit f0ff94137b5ae55ed6b12d9a593182a04c47ebab by Harald Sitter.
Committed on 04/11/2020 at 14:45.
Pushed by sitter into branch 'Neon/stable'.
further extend spdx coverage
I've asked and both Rohan and Jonathan are OK with the licensing terms.
Also relicensing debian/* accordingly so it matches up.
Also adding a symlink so debian/copyright also serves as reuse dep5
file.
A +1 -0 .reuse/dep5
M +7 -36 debian/copyright
M +3 -0 desktop/calamares/desktop/branding/neon/branding.desc
M +5 -0 desktop/calamares/desktop/branding/neon/stylesheet.qss
M +2 -0 desktop/calamares/desktop/modules/bootloader.conf
M +3 -0 desktop/calamares/desktop/modules/displaymanager.conf
M +3 -0 desktop/calamares/desktop/modules/finished.conf
M +3 -0 desktop/calamares/desktop/modules/fstab.conf
M +3 -0 desktop/calamares/desktop/modules/keyboard.conf
M +2 -0 desktop/calamares/desktop/modules/locale.conf
M +2 -0 desktop/calamares/desktop/modules/machineid.conf
M +3 -0 desktop/calamares/desktop/modules/mount.conf
M +3 -0 desktop/calamares/desktop/modules/netinstall.conf
M +4 -0 desktop/calamares/desktop/modules/packages.conf
M +4 -0 desktop/calamares/desktop/modules/partition.conf
M +2 -39 desktop/calamares/desktop/modules/umount.conf
M +4 -0 desktop/calamares/desktop/modules/unpackfs.conf
M +3 -0 desktop/calamares/desktop/modules/users.conf
M +4 -0 desktop/calamares/desktop/modules/welcome.conf
M +4 -0 desktop/calamares/desktop/settings.conf
M +2 -0 desktop/usr/share/calamares/netinstall.php
M +2 -0 oem-prepare/calamares/oem-prepare/oem-prepare.desktop
M +3 -0 oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/defaults
M +3 -0 oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/layouts/org.kde.plasma.desktop-layout.js
M +2 -0 oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/metadata.desktop
M +2 -8 pinebook/lib/live/config/1200-calamares
M +4 -0 pinebook/usr/sbin/deferred_removal
M +3 -0 pinebook/usr/sbin/fs_resize
https://invent.kde.org/neon/neon/calamares-settings/commit/f0ff94137b5ae55ed6b12d9a593182a04c47ebab
diff --git a/.reuse/dep5 b/.reuse/dep5
new file mode 120000
index 0000000..9543808
--- /dev/null
+++ b/.reuse/dep5
@@ -0,0 +1 @@
+../debian/copyright
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 8475b16..2bfcd70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,9 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: calamares
-Source: <url://example.com>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: calamares-settings
+Source: https://invent.kde.org/neon/neon/calamares-settings
-Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
-Copyright: 2014 Rohan Garg <shadeslayer at systems>
-License: GPL-2+
- This package 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 2 of the License, or
- (at your option) any later version.
- .
- This package 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 this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+Copyright: 2014-2016 Rohan Garg <garg at kde.org>
+Copyright: 2017 Jonathan Riddell <jr at jriddell.org>
+Copyright: 2018-2019 Harald Sitter <sitter at kde.org>
+License: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
diff --git a/desktop/calamares/desktop/branding/neon/branding.desc b/desktop/calamares/desktop/branding/neon/branding.desc
index 537510b..24110ae 100644
--- a/desktop/calamares/desktop/branding/neon/branding.desc
+++ b/desktop/calamares/desktop/branding/neon/branding.desc
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
---
componentName: neon
diff --git a/desktop/calamares/desktop/branding/neon/stylesheet.qss b/desktop/calamares/desktop/branding/neon/stylesheet.qss
index 92b5b35..1f2d79e 100644
--- a/desktop/calamares/desktop/branding/neon/stylesheet.qss
+++ b/desktop/calamares/desktop/branding/neon/stylesheet.qss
@@ -1,3 +1,8 @@
+/*
+ SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+ SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+*/
+
#logoApp {
min-height: 80px;
margin-bottom: 15px;
diff --git a/desktop/calamares/desktop/modules/bootloader.conf b/desktop/calamares/desktop/modules/bootloader.conf
index a4f82c6..1d83031 100644
--- a/desktop/calamares/desktop/modules/bootloader.conf
+++ b/desktop/calamares/desktop/modules/bootloader.conf
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
---
efiBootLoader: "grub"
diff --git a/desktop/calamares/desktop/modules/displaymanager.conf b/desktop/calamares/desktop/modules/displaymanager.conf
index fd49152..47d6b19 100644
--- a/desktop/calamares/desktop/modules/displaymanager.conf
+++ b/desktop/calamares/desktop/modules/displaymanager.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
+#
# Configure one or more display managers (e.g. SDDM)
# with a "best effort" approach.
---
diff --git a/desktop/calamares/desktop/modules/finished.conf b/desktop/calamares/desktop/modules/finished.conf
index 18951b3..263e67e 100644
--- a/desktop/calamares/desktop/modules/finished.conf
+++ b/desktop/calamares/desktop/modules/finished.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2015-2016 Rohan Garg <rohan at kde.org>
---
restartNowMode: user-checked
restartNowCommand: "systemctl -i reboot"
diff --git a/desktop/calamares/desktop/modules/fstab.conf b/desktop/calamares/desktop/modules/fstab.conf
index d89daa5..38d79c6 100644
--- a/desktop/calamares/desktop/modules/fstab.conf
+++ b/desktop/calamares/desktop/modules/fstab.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
+#
# Creates /etc/fstab and /etc/crypttab in the target system.
# Also creates mount points for all the filesystems.
#
diff --git a/desktop/calamares/desktop/modules/keyboard.conf b/desktop/calamares/desktop/modules/keyboard.conf
index ee97c39..c2518a1 100644
--- a/desktop/calamares/desktop/modules/keyboard.conf
+++ b/desktop/calamares/desktop/modules/keyboard.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
+#
# NOTE: you must have ckbcomp installed and runnable
# on the live system, for keyboard layout previews.
---
diff --git a/desktop/calamares/desktop/modules/locale.conf b/desktop/calamares/desktop/modules/locale.conf
index 79b897f..d0068d9 100644
--- a/desktop/calamares/desktop/modules/locale.conf
+++ b/desktop/calamares/desktop/modules/locale.conf
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
---
geoipUrl: https://geoip.kde.org/v1/calamares
geoipStyle: json
diff --git a/desktop/calamares/desktop/modules/machineid.conf b/desktop/calamares/desktop/modules/machineid.conf
index 2636872..cdbdde8 100644
--- a/desktop/calamares/desktop/modules/machineid.conf
+++ b/desktop/calamares/desktop/modules/machineid.conf
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
---
# Whether to create /etc/machine-id for systemd.
systemd: true
diff --git a/desktop/calamares/desktop/modules/mount.conf b/desktop/calamares/desktop/modules/mount.conf
index bb28eed..64e0518 100644
--- a/desktop/calamares/desktop/modules/mount.conf
+++ b/desktop/calamares/desktop/modules/mount.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
+#
# Mount filesystems in the target (generally, before treating the
# target as a usable chroot / "live" system). Filesystems are
# automatically mounted from the partitioning module. Filesystems
diff --git a/desktop/calamares/desktop/modules/netinstall.conf b/desktop/calamares/desktop/modules/netinstall.conf
index 3264295..69cd90d 100644
--- a/desktop/calamares/desktop/modules/netinstall.conf
+++ b/desktop/calamares/desktop/modules/netinstall.conf
@@ -1,2 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
---
groupsUrl: file:///usr/share/calamares/netinstall.php
diff --git a/desktop/calamares/desktop/modules/packages.conf b/desktop/calamares/desktop/modules/packages.conf
index 2fda114..8ef8e22 100644
--- a/desktop/calamares/desktop/modules/packages.conf
+++ b/desktop/calamares/desktop/modules/packages.conf
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2014-2016 Rohan Garg <rohan at kde.org>
+
backend: apt
operations:
diff --git a/desktop/calamares/desktop/modules/partition.conf b/desktop/calamares/desktop/modules/partition.conf
index 86987f8..743a64c 100644
--- a/desktop/calamares/desktop/modules/partition.conf
+++ b/desktop/calamares/desktop/modules/partition.conf
@@ -1 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019-2020 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
+
enableLuksAutomatedPartitioning: true
diff --git a/desktop/calamares/desktop/modules/umount.conf b/desktop/calamares/desktop/modules/umount.conf
index 798dfc3..2dac1ab 100644
--- a/desktop/calamares/desktop/modules/umount.conf
+++ b/desktop/calamares/desktop/modules/umount.conf
@@ -1,42 +1,5 @@
-### Umount Module
-#
-# This module represents the last part of the installation, the unmounting
-# of partitions used for the install. It is also the last place where it
-# is possible to copy files to the target system, thus the best place to
-# copy an installation log.
-#
-# This module has two configuration keys:
-# srcLog location in the live system where the log is
-# destLog location in the target system to copy the log
-#
-# You can either use the default source path (which is
-# `/root/.cache/Calamares/Calamares/Calamares.log` ) to copy the regular log,
-# or if you want to use the full output of `sudo calamares -d` you will need
-# to redirect standard output, for instance in a launcher script or
-# in the desktop file.
-#
-# Example launcher script:
-#
-# ```
-# #!/bin/sh
-# sudo /usr/bin/calamares -d > installation.log
-# ```
-#
-# Example desktop line:
-#
-# ```
-# Exec=sudo /usr/bin/calamares -d > installation.log
-# ```
-#
-# If no source and destination are set, no copy is attempted. If the
-# copy fails for some reason, a warning is printed but the installation
-# does not fail.
-
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
---
-# example when using the normal Calamares log:
srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"
destLog: "/var/log/Calamares.log"
-
-# example when using a log created by `sudo calamares -d`:
-#srcLog: "/home/live/installation.log"
-#destLog: "/var/log/installation.log"
diff --git a/desktop/calamares/desktop/modules/unpackfs.conf b/desktop/calamares/desktop/modules/unpackfs.conf
index 96d16a5..6b0c112 100644
--- a/desktop/calamares/desktop/modules/unpackfs.conf
+++ b/desktop/calamares/desktop/modules/unpackfs.conf
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+# SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
---
unpack:
- source: "/cdrom/casper/filesystem.squashfs"
diff --git a/desktop/calamares/desktop/modules/users.conf b/desktop/calamares/desktop/modules/users.conf
index 76120ae..0a14dac 100644
--- a/desktop/calamares/desktop/modules/users.conf
+++ b/desktop/calamares/desktop/modules/users.conf
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2015-2016 Rohan Garg <rohan at kde.org>
---
doAutologin: false
setRootPassword: false
diff --git a/desktop/calamares/desktop/modules/welcome.conf b/desktop/calamares/desktop/modules/welcome.conf
index 2ecfd71..e2d57c7 100644
--- a/desktop/calamares/desktop/modules/welcome.conf
+++ b/desktop/calamares/desktop/modules/welcome.conf
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+# SPDX-FileCopyrightText: 2015-2016 Rohan Garg <rohan at kde.org>
---
showSupportUrl: true
showKnownIssuesUrl: true
diff --git a/desktop/calamares/desktop/settings.conf b/desktop/calamares/desktop/settings.conf
index 1235b0f..55eb65d 100644
--- a/desktop/calamares/desktop/settings.conf
+++ b/desktop/calamares/desktop/settings.conf
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+# SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
---
modules-search: [ local ]
diff --git a/desktop/usr/share/calamares/netinstall.php b/desktop/usr/share/calamares/netinstall.php
index d955dcc..32177d8 100644
--- a/desktop/usr/share/calamares/netinstall.php
+++ b/desktop/usr/share/calamares/netinstall.php
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
- name: "Restricted Media Formats"
description: "Media tools with restricted uses"
packages:
diff --git a/oem-prepare/calamares/oem-prepare/oem-prepare.desktop b/oem-prepare/calamares/oem-prepare/oem-prepare.desktop
index 94df589..10bfe9e 100644
--- a/oem-prepare/calamares/oem-prepare/oem-prepare.desktop
+++ b/oem-prepare/calamares/oem-prepare/oem-prepare.desktop
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019-2020 Harald Sitter <sitter at kde.org>
[Desktop Entry]
Exec=/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
Icon=preferences-system
diff --git a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/defaults b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/defaults
index fed132a..b87da5a 100644
--- a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/defaults
+++ b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/defaults
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018 Harald Sitter <sitter at kde.org>
+
[kcminputrc][Mouse]
cursorTheme=breeze_cursors
diff --git a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/layouts/org.kde.plasma.desktop-layout.js b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/layouts/org.kde.plasma.desktop-layout.js
index 25fac5c..33eb2e0 100644
--- a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/layouts/org.kde.plasma.desktop-layout.js
+++ b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/contents/layouts/org.kde.plasma.desktop-layout.js
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+// SPDX-FileCopyrightText: 2018 Harald Sitter <sitter at kde.org>
+
var plasma = getApiVersion(1);
var layout = {
diff --git a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/metadata.desktop b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/metadata.desktop
index 885250b..6a32c69 100644
--- a/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/metadata.desktop
+++ b/oem-prepare/calamares/oem-prepare/prepare-user/oem-lnf/metadata.desktop
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2019-2020 Harald Sitter <sitter at kde.org>
[Desktop Entry]
Comment=
Name=OEM
diff --git a/pinebook/lib/live/config/1200-calamares b/pinebook/lib/live/config/1200-calamares
index 01d3896..3fcbbbd 100755
--- a/pinebook/lib/live/config/1200-calamares
+++ b/pinebook/lib/live/config/1200-calamares
@@ -1,12 +1,6 @@
#!/bin/sh
-
-## live-config(7) - System Configuration Components
-## Copyright (C) 2014 Rohan Garg <rohan at kde.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2014-2017 Rohan Garg <rohan at kde.org>
set -e
diff --git a/pinebook/usr/sbin/deferred_removal b/pinebook/usr/sbin/deferred_removal
index 04ef568..ac11633 100755
--- a/pinebook/usr/sbin/deferred_removal
+++ b/pinebook/usr/sbin/deferred_removal
@@ -1,4 +1,8 @@
#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2017 Rohan Garg <rohan at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+
set -x
set -e
diff --git a/pinebook/usr/sbin/fs_resize b/pinebook/usr/sbin/fs_resize
index 427914a..61b97ea 100755
--- a/pinebook/usr/sbin/fs_resize
+++ b/pinebook/usr/sbin/fs_resize
@@ -1,4 +1,7 @@
#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2017 Rohan Garg <rohan at kde.org>
+
set -e
ROOT='/dev/mmcblk0'
More information about the Neon-commits
mailing list