Revert "Remove all mention of the CC0 licence; use GPL for all"

This reverts commit ef220e625c6741cc15f29a77e457c7094fc79541.

3 files changed, 24 insertions, 12 deletions

diff --git a/README b/README
index cc9d184..9409648 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ starts by:
 Copyright 2008 PRAGMA ADE / ConTeXt Development Team
 "
 
-for otf-*.lua files except those below, and
+for otf-*.lua files except otfl-font-clr.lua and otfl-luat-ovr.lua, and
 
 "
 Copyright 2010 Luaotfload Development Team
@@ -103,3 +103,17 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 "
 
+
+The file luaotfload.dtx and the derived files
+  luaotfload.pdf
+  luaotfload.sty
+  luaotfload.lua
+  
+as well as the file mkluatexfontdb.lua are under the CC0 license. You can find
+the CC0 license full text at
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+and a FAQ at
+
+http://wiki.creativecommons.org/CC0
diff --git a/luaotfload.dtx b/luaotfload.dtx
index 4ca3dc8..4f83091 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -3,11 +3,10 @@
 % Copyright (C) 2009-2010 by Elie Roux    <elie.roux@telecom-bretagne.eu>
 %                        and Khaled Hosny <khaledhosny@eglug.org>
 %
-% This work is distributed under the GNU General Public License v3.
-% This work consists of this source file luaotfload.dtx and other
-% files listed in the README.
+% This work is under the CC0 license.
 %
-% This file is used the source for the derived files
+% This work consists of the main source file luaotfload.dtx
+% and the derived files
 %    luaotfload.sty, luaotfload.lua
 %
 % Unpacking:
@@ -50,11 +49,10 @@ This is a generated file.
 Copyright (C) 2009-2010 by by Elie Roux    <elie.roux@telecom-bretagne.eu>
                           and Khaled Hosny <khaledhosny@eglug.org>
 
-This work is distributed under the GNU General Public License v3.
-This work consists of this source file luaotfload.dtx and other
-files listed in the README.
+This work is under the CC0 license.
 
-This file luaotfload.dtx was to generate the derived files
+This work consists of the main source file luaotfload.dtx
+and the derived files
     luaotfload.sty, luaotfload.lua
 
 \endpreamble
@@ -391,7 +389,7 @@ luaotfload.module = {
     description   = "ConTeXt font loading system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
-    license       = "GNU GPL v3"
+    license       = "CC0"
 }
 
 luatexbase.provides_module(luaotfload.module)
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index 01fca8a..5eac9ae 100755
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env texlua
 --[[
-This file is copyright 2010 Elie Roux and Khaled Hosny and is distributed
-under the GNU General Public License v3: http://www.gnu.org/licenses/gpl.html
+This file is copyright 2010 Elie Roux and Khaled Hosny and is under CC0
+license (see http://creativecommons.org/publicdomain/zero/1.0/legalcode).
 
 This file is a wrapper for the luaotfload's font names module. It is part of the
 luaotfload bundle, please see the luaotfload documentation for more info.