From ba2ce5e927be61616c88bf9ea298757a8c9110f2 Mon Sep 17 00:00:00 2001 From: Nico Alt <nicoalt@posteo.org> Date: Mon, 25 Mar 2019 21:52:48 +0100 Subject: [PATCH] Use smaller license identifiers at files' top https://reuse.software/ --- data/app.briar.gtk.appdata.xml.in | 2 +- src/briar-gtk.in | 17 +++-------------- src/briar/api/api.py | 15 ++------------- src/briar/api/briar.py | 17 +++-------------- src/briar/gtk/application.py | 15 ++------------- src/briar/gtk/container.py | 15 ++------------- src/briar/gtk/define.py | 15 ++------------- src/briar/gtk/logger.py | 15 ++------------- src/briar/gtk/window.py | 15 ++------------- src/meson_post_install.py | 3 +++ tools/generate_data.sh | 4 ++++ 11 files changed, 26 insertions(+), 107 deletions(-) diff --git a/data/app.briar.gtk.appdata.xml.in b/data/app.briar.gtk.appdata.xml.in index 2ec7c35..4fffb49 100644 --- a/data/app.briar.gtk.appdata.xml.in +++ b/data/app.briar.gtk.appdata.xml.in @@ -2,7 +2,7 @@ <component type="desktop"> <id>app.briar.gtk.desktop</id> <metadata_license>CC-BY-4.0</metadata_license> - <project_license>GPL-3.0-or-later</project_license> + <project_license>AGPL-3.0-only</project_license> <description> </description> </component> diff --git a/src/briar-gtk.in b/src/briar-gtk.in index e29cffa..e96a564 100755 --- a/src/briar-gtk.in +++ b/src/briar-gtk.in @@ -1,19 +1,8 @@ #!@PYTHON@ - -# Copyright 2019 Nico Alt -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# Copyright (c) 2019 Nico Alt +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md # # Initial version based on GNOME Lollypop # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop.in diff --git a/src/briar/api/api.py b/src/briar/api/api.py index 7e613ce..21d60c5 100644 --- a/src/briar/api/api.py +++ b/src/briar/api/api.py @@ -1,17 +1,6 @@ # Copyright (c) 2019 Nico Alt -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md from subprocess import Popen, PIPE diff --git a/src/briar/api/briar.py b/src/briar/api/briar.py index 5d947b3..c9b8afe 100644 --- a/src/briar/api/briar.py +++ b/src/briar/api/briar.py @@ -1,17 +1,6 @@ -# Copyright 2019 Torsten Grote -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# Copyright (c) 2019 Torsten Grote +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md # # Originally coming from # https://code.briarproject.org/grote/briar-cli-python-demo/blob/master/briar-cli.py diff --git a/src/briar/gtk/application.py b/src/briar/gtk/application.py index 342db90..90ee3d5 100644 --- a/src/briar/gtk/application.py +++ b/src/briar/gtk/application.py @@ -1,18 +1,7 @@ # Copyright (c) 2019 Nico Alt # Copyright (c) 2014-2018 Cedric Bellegarde <cedric.bellegarde@adishatz.org> -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md # # Initial version based on GNOME Lollypop # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop/application.py diff --git a/src/briar/gtk/container.py b/src/briar/gtk/container.py index e9770b0..0b1a1ae 100644 --- a/src/briar/gtk/container.py +++ b/src/briar/gtk/container.py @@ -1,17 +1,6 @@ # Copyright (c) 2019 Nico Alt -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md from briar.gtk.define import App from briar.gtk.logger import Logger diff --git a/src/briar/gtk/define.py b/src/briar/gtk/define.py index 5091236..c2c9aaf 100644 --- a/src/briar/gtk/define.py +++ b/src/briar/gtk/define.py @@ -1,18 +1,7 @@ # Copyright (c) 2019 Nico Alt # Copyright (c) 2014-2018 Cedric Bellegarde <cedric.bellegarde@adishatz.org> -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md # # Initial version based on GNOME Lollypop # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop/define.py diff --git a/src/briar/gtk/logger.py b/src/briar/gtk/logger.py index b4a8839..5ae54ec 100644 --- a/src/briar/gtk/logger.py +++ b/src/briar/gtk/logger.py @@ -1,19 +1,8 @@ # Copyright (c) 2019 Nico Alt # Copyright (c) 2014-2018 Cedric Bellegarde <cedric.bellegarde@adishatz.org> # Copyright (c) 2017 Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md # # Initial version based on GNOME Lollypop # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop/logger.py diff --git a/src/briar/gtk/window.py b/src/briar/gtk/window.py index be261b8..2f7d7a4 100644 --- a/src/briar/gtk/window.py +++ b/src/briar/gtk/window.py @@ -1,17 +1,6 @@ # Copyright (c) 2019 Nico Alt -# -# This program 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. -# -# This program 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 <https://www.gnu.org/licenses/>. +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md from briar.gtk.container import Container from briar.gtk.define import App diff --git a/src/meson_post_install.py b/src/meson_post_install.py index 6a3ea97..367e2c4 100755 --- a/src/meson_post_install.py +++ b/src/meson_post_install.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 +# Copyright (c) 2019 Nico Alt +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md from os import environ, path from subprocess import call diff --git a/tools/generate_data.sh b/tools/generate_data.sh index 4a65b4e..af6de4e 100755 --- a/tools/generate_data.sh +++ b/tools/generate_data.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright (c) 2019 Nico Alt +# SPDX-License-Identifier: AGPL-3.0-only +# License-Filename: LICENSE.md +# # Initial version from GNOME Lollypop # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/generate_data.sh -- GitLab