FIX: dual licensing of parts

diff --git a/LICENSE b/LICENSE
index d7f105139782ab695d86613e343916f7372f4ac0..0bf22f601a6b07c56f411beb07592ba3064e4bbd 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,7 @@
+For detailed License information see "debian/copyright".
+
+Most of the code is licensed under GPL:
+
 GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

diff --git a/debian/copyright b/debian/copyright
index 321e7bf069de3d44e3561e3eaea0d60d6153681f..8b5693cb9959ef41bdea7b06c2d31203dbf96b18 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,11 +12,15 @@ License: GPL-2.0+
 
 Files: src/org/cacert/gigi/output/template
 Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
-License: BSD
+License: BSD or GPL-2.0+
 
 Files: src/org/cacert/gigi/localisation
 Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
-License: BSD
+License: BSD or GPL-2.0+
+
+Files: src/org/cacert/gigi/database
+Copyright: 2015 CAcert Software Team <cacert-devel@cacert.org>
+License: BSD or GPL-2.0+
 
 License: BSD
  Copyright (c) 2015, CAcert