From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 27 Dec 2015 11:56:45 +0000 (+0100)
Subject: Tweak LICENSE
X-Git-Tag: Release-7.4.0~85
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1e2d40ae9921f9ddb0f4107430da31f1a65a7554;p=bacula%2Fbacula

Tweak LICENSE
---

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 83b6ff1ae6..8f657c3be4 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -27,7 +27,6 @@ General Public License are as follows:
    Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2015 Free Software Foundation Europe e.V.
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -59,6 +58,15 @@ AGPLv3 are as follows:
    the AGPLv3 in all respects for all of the code used other than for the
    Microsoft VSS code.
 
+The copyright for certain source files may include in addition to what is
+listed above the following copyright:
+
+   Copyright (C) 2000-2015 Free Software Foundation Europe e.V.
+
+The copyright on the Baculum code is:
+
+   Copyright (C) 2013-2015 Marcin Haba
+
 Copyrights of certain "script" files such as headers, shell script, Makefiles,
 etc ... were never explicitly defined. In almost all cases, they have
 been copyrighted with a BSD 2-Clause copyright to make them easier. However,