5 files changed, 35 insertions, 29 deletions
diff --git a/src/lib/common.sh.top b/src/lib/common.sh.top
index 9c4ba2e..d45a7dd 100644
--- a/src/lib/common.sh.top
+++ b/src/lib/common.sh.top
@@ -4,14 +4,7 @@
 # This file is included by libremessages.
 # You should probably use libremessages instead of this.
 
-# 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; version 2 of the License.
-#
-# 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.
+# License: Unspecified
 
 shopt -s extglob
 
diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index ee52f6f..3e07c11 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -1,7 +1,9 @@
 #!/bin/bash # non-executable, but put this there as a hint to text editors
 # This may be included with or without `set -euE`
 
-#   Copyright (C) 2012-2014 by Luke Shumaker <lukeshu@sbcglobal.net>
+#   Copyright (C) 2012-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+#   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
diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist
index 5525098..fdd27f9 100755
--- a/src/lib/libreblacklist
+++ b/src/lib/libreblacklist
@@ -2,7 +2,9 @@
 # This may be included with or without `set -euE`
 # When run directly, it does `set -euE`
 
-#   Copyright (C) 2013-2014 by Luke Shumaker <lukeshu@sbcglobal.net>
+#   Copyright (C) 2013-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+#   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
diff --git a/src/lib/librelib b/src/lib/librelib
index d0a06e5..63d9a26 100755
--- a/src/lib/librelib
+++ b/src/lib/librelib
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-#   Copyright (C) 2013-2014 by Luke Shumaker <lukeshu@sbcglobal.net>
+#   Copyright (C) 2013-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+#   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
diff --git a/src/lib/libremessages b/src/lib/libremessages
index 162c8fb..71f1636 100755
--- a/src/lib/libremessages
+++ b/src/lib/libremessages
@@ -2,28 +2,35 @@
 # This may be included with or without `set -euE`
 # When run directly, it does `set -euE`
 
-#   Copyright (C) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
+# Copyright (C) 2012-2014 Luke Shumaker <lukeshu@sbcglobal.net>
+
+# For just the setup_traps() function:
+#   Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>
 #   Copyright (C) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (C) 2005 by Aurelien Foret <orelien@chez.com>
-#   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 by Miklos Vajna <vmiklos@frugalware.org>
-#   Copyright (C) 2011 by Joshua Haase <hahj87@gmail.com>
-#   Copyright (C) 2012-2014 by Luke Shumaker <lukeshu@sbcglobal.net>
+#   Copyright (C) 2005 Aurelien Foret <orelien@chez.com>
+#   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>
+#   Copyright (C) 2006 Miklos Vajna <vmiklos@frugalware.org>
+#
+# 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
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
+# 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.
+# 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 <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# setup_traps() is based on pacman:makepkg, which is GPLv2+,
+# so we take the '+' to combine it with our GPLv3+.
 
 ################################################################################
 # Inherit most functions from devtools                                         #