X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FLICENSE;h=bd6fa9db7e1113acd1b292cfa4cead425bd5a7a9;hb=fd18c27a531b11fcfe67c17fa0ff818c11bef3e7;hp=cb3b4d39654c688a6c5dc43becbc26fa49fcae32;hpb=1ff1d36f1cc2df9d09a506ab138cf75507519969;p=bacula%2Fbacula

diff --git a/bacula/LICENSE b/bacula/LICENSE
index cb3b4d3965..bd6fa9db7e 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -1,3 +1,9 @@
+History:
+The original Bacula code was Copyright Kern Sibbald and John Walker.
+After November 2004, it became Copyright Kern Sibbald, and finally,
+the copyright was transferred to the Free Software Foundation Europe
+on 15 November 2006.
+
 Trademark:
 The name Bacula is a registered trademark.
 
@@ -5,9 +11,9 @@ The name Bacula is a registered trademark.
 
 License:
 For the most part, Bacula is licensed under the GPL version 2         
-and any code that is Copyright Kern Sibbald and John Walker or
-Copyright Kern Sibbald (after November 2004) with the GPL
-indication is so licensed, but with the following four additions:
+with the additions listed below. Most this code is listed
+under Copyright Free Software Foundation Europe e.V.  What
+follows are the additions to the GPL version 2 license.
 
 Linking: 
 Bacula may be linked with any libraries permitted under the GPL,
@@ -38,17 +44,31 @@ the copyright license set forth in this Agreement.
 
 Code falling under the above conditions will be marked as follows:
 
-   Copyright (C) 2000-2006 Kern Sibbald
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file 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.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   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 
-   the file LICENSE for additional details.
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
 
 
 Windows: