From 417059baab4539ae17290734137706c84b129216 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 17 Jul 2016 18:12:21 +0200 Subject: [PATCH] Tweak LICENSEs --- bacula/LICENSE | 25 +++++++++++++------------ bacula/LICENSE-FOSS | 27 +++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bacula/LICENSE b/bacula/LICENSE index 8f657c3be4..6f339a731d 100644 --- a/bacula/LICENSE +++ b/bacula/LICENSE @@ -1,5 +1,6 @@ - Last revision: 06 May 2014 + Last major revision: 06 May 2014 + Last minor revision: 16 July 2016 Bacula is licensed under the GNU Affero General Public License, version 3.0 as published by the Free Software Foundation, Inc. ("AGPLv3"). @@ -26,7 +27,7 @@ General Public License are as follows: Bacula(R) - The Network Backup Solution - Copyright (C) 2000-2015 Kern Sibbald + Copyright (C) 2000-2016 Kern Sibbald The original author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -61,28 +62,28 @@ AGPLv3 are as follows: 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. + Copyright (C) 2000-2016 Free Software Foundation Europe e.V. The copyright on the Baculum code is: - Copyright (C) 2013-2015 Marcin Haba + Copyright (C) 2013-2016 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, -as is the case of all BSD type copyrights you must keep the copyright in -place and on any binary only released the copyright notice must also be -released with the binaries. An example of such a copyright is: +Copyrights of certain "script" files such as headers, shell script, +Makefiles, etc ... were previously not explicitly defined. In almost all +cases, they are now copyrighted with a BSD 2-Clause copyright to make them +easier. However, as is the case of all BSD type copyrights you must keep +the copyright in place and on any binary only released, the copyright notice +must also be released with the binaries. An example of such a copyright is: # -# Copyright (C) 2000-2015 Kern Sibbald +# Copyright (C) 2000-2016 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS # It is equivalent to the full BSD copyright of: ===== -Copyright (C) 2000-2015 Kern Sibbald +Copyright (C) 2000-2016 Kern Sibbald License: BSD 2-Clause; see file LICENSE-FOSS Redistribution and use in source and binary forms, with or without diff --git a/bacula/LICENSE-FOSS b/bacula/LICENSE-FOSS index 1e22e24933..ad7bbb7590 100644 --- a/bacula/LICENSE-FOSS +++ b/bacula/LICENSE-FOSS @@ -45,24 +45,23 @@ sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in the LICENSE file.. Notices: -The Bacula community version uses a certain number of files that have -FOSS (Free or Open Software) licenses. Many of these files come from and are -identical to the Bacula community code. Most 3rd party FOSS licenses require -no notification so they are not included here. - -However, the Bacula Community binary releases consist of -files, with few source files (mostly scripts), and some of the FOSS licenses -such such as the BSD (Berkeley Software Development) require publication of -the copyright notices if the code is released in binary format. For example +The Bacula community version uses a certain number of files that have FOSS +(Free or Open Software) licenses. Most 3rd party FOSS licenses require no +notification so they are not included here. + +However, the Bacula Community binary releases consist of files, with few +source files (mostly scripts), and some of the FOSS licenses such such as +the BSD (Berkeley Software Development) require publication of the +copyright notices if the code is released in binary format. For example certain copyright notifications are simplifed such as: -# Copyright (C) 2000-2015 Kern Sibbald +# Copyright (C) 2000-2016 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS This license corresponds to the following: ===== -Copyright (C) 2000-2015 Kern Sibbald +Copyright (C) 2000-2016 Kern Sibbald License: BSD 2-Clause; see file LICENSE-FOSS Redistribution and use in source and binary forms, with or without @@ -109,15 +108,15 @@ Manpages: This man page document is released under the BSD 2-Clause license. Update datbase (updatedb): -# Copyright (C) 2000-2015 Kern Sibbald +# Copyright (C) 2000-2016 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS Scripts (scripts): -# Copyright (C) 2000-2015 Kern Sibbald +# Copyright (C) 2000-2016 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS Platforms (platforms): -# Copyright (C) 2000-2015 Kern Sibbald +# Copyright (C) 2000-2016 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS Libraries (src/lib): -- 2.39.5