From 428508906dd585f2529c23b49e9c1fe655a207b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 20 Feb 2015 02:48:16 +0100 Subject: [PATCH] FIX: dual licensing of parts --- LICENSE | 4 ++++ debian/copyright | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index d7f10513..0bf22f60 100644 --- 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 321e7bf0..8b5693cb 100644 --- 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 -License: BSD +License: BSD or GPL-2.0+ Files: src/org/cacert/gigi/localisation Copyright: 2015 CAcert Software Team -License: BSD +License: BSD or GPL-2.0+ + +Files: src/org/cacert/gigi/database +Copyright: 2015 CAcert Software Team +License: BSD or GPL-2.0+ License: BSD Copyright (c) 2015, CAcert -- 2.39.2