Do an audit of copyright and license claims

5 files changed, 41 insertions, 34 deletions

diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir
index 27b285c..51863e3 100755
--- a/src/abslibre-tools/createworkdir
+++ b/src/abslibre-tools/createworkdir
@@ -1,28 +1,29 @@
 #!/usr/bin/env bash
-set -euE
 # CreateWorkDir
 # Creates a dir structure for working with Parabola packages
 
-# Copyright (C) 2010 Nicolás Reynolds
-# Copyright (C) 2013 Luke Shumaker
-
-# ---------- GNU General Public License 3 ----------
-
+# Copyright (C) 2010 Nicolás Reynolds <fauno@parabola.nu>
+# Copyright (C) 2013 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+# License: GNU GPLv3+
+#
 # This file is part of Parabola.
-
+#
 # Parabola 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.
-
+#
 # Parabola 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 Parabola. If not, see <http://www.gnu.org/licenses/>.
 
+set -euE
+
 . libremessages
 . $(librelib conf.sh)
 load_files libretools
diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree
index af5bbe5..e8c18e6 100755
--- a/src/abslibre-tools/diff-unfree
+++ b/src/abslibre-tools/diff-unfree
@@ -1,22 +1,23 @@
 #!/usr/bin/env bash
 # This script will help you diff a *-libre PKGBUILD against the unfree one
 # to check for updates.
-# Copyright (C) 2010 Nicolás Reynolds
-
-# ---------- GNU General Public License 3 ----------
 
+# Copyright (C) 2010 Nicolás Reynolds <fauno@parabola.nu>
+#
+# License: GNU GPLv3+
+#
 # This file is part of Parabola.
-
+#
 # Parabola 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.
-
+#
 # Parabola 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 Parabola. If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff
index ebd749d..641f552 100755
--- a/src/abslibre-tools/libreaddiff
+++ b/src/abslibre-tools/libreaddiff
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-set -e
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011, 2012  Michał Masłowski  <mtjm@mtjm.eu>
+
+# Copyright (C) 2011-2012 Michał Masłowski <mtjm@mtjm.eu>
+#
+# License: GNU GPLv3+
 #
 # 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
@@ -16,6 +18,8 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -e
+
 . $(librelib conf.sh)
 load_files libretools
 check_vars libretools WORKDIR
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 8b1e05f..eec62d7 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -2,23 +2,19 @@
 # Librerelease
 # Uploads packages into [staging]
 
-# Copyright (C) 2010 Nicolás Reynolds
-# Copyright (C) 2013-2014 Luke Shumaker
+# Copyright (C) 2010 Nicolás Reynolds <fauno@parabola.nu>
+# Copyright (C) 2013-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+#
 # For just the create_signature() function:
 #   Copyright (C) 2006-2013 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (C) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
-#   Copyright (C) 2005 by Aurelien Foret <orelien@chez.com>
-#   Copyright (C) 2006 by Miklos Vajna <vmiklos@frugalware.org>
-#   Copyright (C) 2005 by Christian Hamar <krics@linuxforum.hu>
-#   Copyright (C) 2006 by Alex Smith <alex@alex-smith.me.uk>
-#   Copyright (C) 2006 by Andras Voroskoi <voroskoi@frugalware.org>
-#   Copyright (C) 2006-2013 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (C) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
-#   Copyright (C) 2005 by Aurelien Foret <orelien@chez.com>
-#   Copyright (C) 2006 by Miklos Vajna <vmiklos@frugalware.org>
-#   Copyright (C) 2005 by Christian Hamar <krics@linuxforum.hu>
-#   Copyright (C) 2006 by Alex Smith <alex@alex-smith.me.uk>
-#   Copyright (C) 2006 by Andras Voroskoi <voroskoi@frugalware.org>
+#   Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>
+#   Copyright (C) 2005 Aurelien Foret <orelien@chez.com>
+#   Copyright (C) 2006 Miklos Vajna <vmiklos@frugalware.org>
+#   Copyright (C) 2005 Christian Hamar <krics@linuxforum.hu>
+#   Copyright (C) 2006 Alex Smith <alex@alex-smith.me.uk>
+#   Copyright (C) 2006 Andras Voroskoi <voroskoi@frugalware.org>
+#
+# License: GNU GPLv3+
 #
 # This file is part of Parabola.
 #
@@ -35,6 +31,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
+# create_signature() is taken from pacman:makepkg, which is GPLv2+,
+# so we take the '+' to combine it with our GPLv3+.
+
 . libremessages
 . $(librelib conf.sh)
 
diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage
index 610de50..6ae0af0 100755
--- a/src/abslibre-tools/librestage
+++ b/src/abslibre-tools/librestage
@@ -2,8 +2,10 @@
 # LibreStage
 # Prepares packages for upload
 
-# Copyright (C) 2010-2011 Nicolás Reynolds
-# Copyright (C) 2013-2014 Luke Shumaker
+# Copyright (C) 2010-2011 Nicolás Reynolds <fauno@parabola.nu>
+# Copyright (C) 2013-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+# License: GNU GPLv3+
 #
 # This file is part of Parabola.
 #