From: Kern Sibbald Date: Wed, 22 Nov 2006 12:57:00 +0000 (+0000) Subject: License updates X-Git-Tag: Release-2.0.0~234 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3dc1ecc7a267222be14356b34d4ef7480e2517e8;p=bacula%2Fdocs License updates --- diff --git a/docs/developers/developers.tex b/docs/developers/developers.tex index ce85351f..06ec6dba 100644 --- a/docs/developers/developers.tex +++ b/docs/developers/developers.tex @@ -35,7 +35,8 @@ \date{\vspace{1.0in}\today \\ This manual documents Bacula version \input{version} \\ \vspace{0.2in}\\ - Copyright \copyright 1999-2006, Kern Sibbald \\ + Copyright \copyright 1999-2006, Free Software Foundation Europe e.V. + \\ \vspace{0.2in}\\ Permission is granted to copy, distribute and/or modify this document under the terms of the \\ GNU Free Documentation License, Version 1.2 published by the Free Software Foundation; \\ diff --git a/docs/developers/generaldevel.tex b/docs/developers/generaldevel.tex index 6d6d9f7b..d63c496e 100644 --- a/docs/developers/generaldevel.tex +++ b/docs/developers/generaldevel.tex @@ -57,140 +57,76 @@ Forge. To avoid future problems concerning changing licensing or copyrights, all code contributions more than a hand full of lines must be in the Public -Domain or have the copyright assigned to Kern Sibbald as in the current +Domain or have the copyright transferred to the Free Software Foundation +Europe e.V. with a Fiduciary License Agreement (FLA). +as in the current code. Note, prior to November 2004, the code was copyrighted by Kern -Sibbald and John Walker. When some sort of Bacula entity is created, this -this copyright will be transferred to that entity. Hopefully this will -happen by Q1-2007. +Sibbald and John Walker. After November 2004, the code was copyrighted +by Kern Sibbald, then on the 15th of November 2006, the copyright was +transferred to the Free Software Foundation Europe e.V. Your name should be clearly indicated as the author of the code, and you must be extremely careful not to violate any copyrights or use other people's code without acknowledging it. The purpose of this requirement is to avoid future copyright, patent, or intellectual property problems. To -understand on possible source of future problems, please examine the +understand the possible source of future problems, please examine the difficulties Mozilla is (was?) having finding previous contributors at \elink{ http://www.mozilla.org/MPL/missing.html} {http://www.mozilla.org/MPL/missing.html}. The other important issue is to avoid copyright, patent, or intellectual property violations as are currently (May 2003) being claimed by SCO against IBM. -Although the copyright will be held by Kern, each developer is expected to +Although the copyright will be held by the Free Software Foundation Europe +e.V., each developer is expected to indicate that he wrote and/or modified a particular module (or file) and any other sources. The copyright assignment may seem a bit unusual, but in -reality, it is not. Most large projects require this. In fact, the -paperwork associated with making contributions to the Free Software -Foundation, was for me unsurmountable, so hopefully the rather -simplified procedure we have will not create any difficulties for -you. +reality, it is not. Most large projects require this. If you have any doubts about this, please don't hesitate to ask. The objective is to assure the long term servival of the Bacula project. Items not needing a copyright assignment are: most small changes, -enhancements, or bug fixes of 5-10 lines of code. +enhancements, or bug fixes of 5-10 lines of code, which amount to +less than 20% of any particular file. -\subsubsection*{Copyright Assignment} +\subsubsection*{Copyright Assignment -- Fiduciary License Agreement} \index{Copyright Assignment} \index{Assignment!Copyright} -\addcontentsline{toc}{subsubsection}{Copyright Assignment} +\addcontentsline{toc}{subsubsection}{Copyright Assignment -- Fiduciary License Agreement} -Since this is not a commercial enterprise, and I prefer to believe in +Since this is not a commercial enterprise, and we prefer to believe in everyone's good faith, previously developers could assign the copyright by explicitly acknowledging that they do so in their first submission. This was sufficient if the developer is independent, or an employee of a not-for-profit organization or a university. However, in an effort to ensure that the Bacula code is really clean, beginning in August 2006, all previous and future developers with CVS access will be asked to submit a -copyright assignment. +copyright assignment (or Fiduciary License Agreement -- FLA). -Any developer who wants to contribute and is employed by a company must get -a copyright assignment from his employer. This is to avoid +Any developer who wants to contribute and is employed by a company should +get a copyright assignment from his employer. This is because in many +counties, all work that an employee does whether on company time or in the +employee's free time is considered to be Intellectual Property of the +company. Obtaining a signed FLA from the company will avoid misunderstandings between the employee, the company, and the Bacula project. A good number of companies have already followed this procedure. -\subsubsection*{Personal Copyright Assignment Statement} -\index{Copyright!Personal Assignment} -\index{Personal Copyright Assignment Statement} -\addcontentsline{toc}{subsubsection}{Personal Copyright Assignment Statement} +The Fiduciary License Agreement is posted on the Bacula web site at: +\elink{http://www.bacula.org/FLA-bacula.en.pdf}{http://www.bacula.org/FLA-bacula.en.pdf} -The following statement must be filled out by each non-employed developer -(please see below for developer's that are employed), signed, and mailed -to my address (please ask me for my address and I will email it -- I'd prefer -not to include it here). +It should be filled out, then sent to: -\footnotesize \begin{verbatim} -Copyright release and transfer statement. - From: - - To: Kern Sibbald - Concerning: Copyright release and transfer - - The undersigned hereby certifies that he/she is independent - and wishes to develop - code for and contribute code to the Bacula project for an - undetermined period of time. The copyright as well as all - other rights to and interests in such contributed code are - hereby transferred to Kern Sibbald. - - Signed in on : - - - + Free Software Foundation Europe + Freedom Task Force + Sumatrastrasse 25 + 8006 Zürich + Switzerland \end{verbatim} -\normalsize - -This release/transfer statement must be sent to: -Kern Sibbald -Address-to-be-given - -If you wish to retain the full rights to use the software you -have contributed in different projects, this is not a problem. Just -request a perpetual non-exclusive license before sending in your -copyright assignment. See the file /src/lib/tls.c -for an example of such a license. - - -\subsubsection*{Corporate Copyright Assignment Statement} -\index{Copyright!Corporate Assignment} -\index{Corporate Copyright Assignment Statement} -\addcontentsline{toc}{subsubsection}{Corporate Copyright Assignment Statement} - -The following statement must be filled out by the employer, signed, and -mailed to my address (please ask me for my address and I will email it -- -I'd prefer not to include it here). - -\footnotesize -\begin{verbatim} -Copyright release and transfer statement. - - - To: Kern Sibbald - Concerning: Copyright release and transfer - - is hereby agrees that and - other employees of are authorized to develop - code for and contribute code to the Bacula project for an - undetermined period of time. The copyright as well as all - other rights to and interests in such contributed code are - hereby transferred to Kern Sibbald. - - Signed in on : - - , - -\end{verbatim} -\normalsize - -This release/transfer statement must be sent to: -Kern Sibbald -Address-to-be-given -If you wish to retain the full rights to use the software you -have contributed in different projects, this is not a problem. Just -request a perpetual non-exclusive license before sending in your -copyright assignment. See the file /src/lib/tls.c -for an example of such a license. +Please note that the above address is different from the officially +registered office mentioned in the document. When you send in such a +complete document, please notify me: kern at sibbald dot com. \subsection*{Basic CVS Usage} diff --git a/docs/manual-de/license.tex b/docs/manual-de/license.tex index faaa3e50..fc70408d 100644 --- a/docs/manual-de/license.tex +++ b/docs/manual-de/license.tex @@ -23,8 +23,8 @@ contributors IP and Copyright claims and non-infringment intentions. The details and governing text are in the file LICENSE in the main source directory. -Most of this code is copyrighted: Copyright \copyright 2000-2004 Kern Sibbald and -John Walker or Copyright \copyright 2000-2005 Kern Sibbald. +Most of this code is copyrighted: Copyright \copyright 2000-2006 +Free Software Foundation Europe e.V. Portions may be copyrighted by other people (ATT, the Free Software Foundation, ...). Generally these portions are released under a @@ -52,7 +52,7 @@ to the public domain. E.g. md5.c, SQLite. \addcontentsline{toc}{subsection}{Trademark} Bacula\raisebox{.6ex}{\textsuperscript{\textregistered}}is a registered -trademark of Kern Sibbald and John Walker. +trademark of John Walker. We have trademarked the Bacula name to ensure that any program using the name Bacula will be exactly compatible with the program that we have diff --git a/docs/manual-de/thanks.tex b/docs/manual-de/thanks.tex index d752b18d..5e35d700 100644 --- a/docs/manual-de/thanks.tex +++ b/docs/manual-de/thanks.tex @@ -38,42 +38,35 @@ improved start/stop script and addition of Bacula userid and group, stunnel, ...), his continuing support of Bacula users. He also wrote the PostgreSQL driver for Bacula and has been a big help in correcting the SQL. -Thanks to Phil Stracchino for writing the gnome-console {\bf ConsoleFont} -configuration command, all the suggestions he has made, and his continuing -suppport of Bacula users. - Thanks to multiple other Bacula Packagers who make and release packages for different platforms for Bacula. Thanks to Christopher Hull for developing the native Win32 Bacula emulation code and for contributing it to the Bacula project. -Thanks to Nicolas Boichat for writing wx-console and the bacula-tray-monitor. -These are very nice GUI additions to Bacula. - Thanks to Thorsten Engel for his excellent knowledge of Win32 systems, and for making the Win32 File daemon Unicode compatible, as well as making the Win32 File daemon interface to Microsoft's Volume Shadow Copy (VSS). These two are big pluses for Bacula! -Thanks to Nic Bellamy for providing the bacula-dir.conf file that he uses to -implement daily tape rotation using multiple Pools. - -Thanks also to Jo Simoens for finding and correcting so many typos and -other problems with the manual. - Thanks to Arno Lehmann for his excellent and infatigable help and advice to users. Thanks to all the Bacula users, especially those of you who have contributed ideas, bug reports, patches, and new features. +Thanks to Nicolas Boichat for writing wx-console and the bacula-tray-monitor. +These are very nice GUI additions to Bacula. + The original variable expansion code used in the LabelFormat comes from the Open Source Software Project (www.ossp.org). It has been adapted and extended -for use in Bacula. +for use in Bacula. This code is now deprecated. -For all those who I have left out, please send me a reminder, and in any case, -thanks for your contribution. +There have been numerous people over the years who have contributed ideas, +code, and help to the Bacula project. The file AUTHORS in the main source +release file contains a list of contributors. For all those who I have +left out, please send me a reminder, and in any case, thanks for your +contribution. \subsection*{Copyrights and Trademarks} \index[general]{Trademarks!Copyrights and } diff --git a/docs/manual-fr/copy.tex b/docs/manual-fr/copy.tex deleted file mode 100644 index b2ffc9ec..00000000 --- a/docs/manual-fr/copy.tex +++ /dev/null @@ -1,36 +0,0 @@ -\vspace*{6cm} -\begin{center} - \copyright\ Copyright 2000-2005 --\pubyear\ \company -\end{center} - -\begin{center} - All Rights Reserved -\end{center} - -This publication, or parts thereof, may not be reproduced in any form, by any -method, for any purpose. - -\company\ makes no warranty, either express or implied, including but not -limited to any implied warranties of merchantability and fitness for a -particular purpose, regarding these materials and makes such materials -available solely on an "as-is" basis. - -In no event shall \company\ be liable to anyone for special, collateral, -incidental, or consequential damages in connection with or arising out of -purchase or use of these materials. The sole and exclusive liability to -\company\ regardless of the form of action, shall not exceed the purchase -price of the materials described herein. - -For condition of use and permission to use these materials for publication in -other than the English language, contact \company - -\company\ reserves the right to revise and improve its products as it sees -fit. This publication describes the state of this product as of the time of -its publication, and may not reflect the product at all times in the future. - -This manual was prepared and published in \pubmonth of \pubyear, and is based -on Release \levelno of \prog. - -MS-DOS and Windows are a registered trademarks of Microsoft. -\clearpage -\tableofcontents diff --git a/docs/manual-fr/license.tex b/docs/manual-fr/license.tex index a9bbbd9e..4902752b 100644 --- a/docs/manual-fr/license.tex +++ b/docs/manual-fr/license.tex @@ -30,8 +30,8 @@ contributors IP and Copyright claims and non-infringment intentions. The details and governing text are in the file LICENSE in the main source directory. -Most of this code is copyrighted: Copyright \copyright 2000-2004 Kern Sibbald and -John Walker or Copyright \copyright 2000-2006 Kern Sibbald. +Most of this code is copyrighted: Copyright \copyright 2000-2006 +Free Software Foundation Europe e.V. Portions may be copyrighted by other people (ATT, the Free Software Foundation, ...). Generally these portions are released under a diff --git a/docs/manual-fr/thanks.tex b/docs/manual-fr/thanks.tex index d752b18d..1d74f66a 100644 --- a/docs/manual-fr/thanks.tex +++ b/docs/manual-fr/thanks.tex @@ -72,8 +72,12 @@ The original variable expansion code used in the LabelFormat comes from the Open Source Software Project (www.ossp.org). It has been adapted and extended for use in Bacula. -For all those who I have left out, please send me a reminder, and in any case, -thanks for your contribution. + +There have been numerous people over the years who have contributed ideas, +code, and help to the Bacula project. The file AUTHORS in the main source +release file contains a list of contributors. For all those who I have +left out, please send me a reminder, and in any case, thanks for your +contribution. \subsection*{Copyrights and Trademarks} \index[general]{Trademarks!Copyrights and } diff --git a/docs/manual/version.tex b/docs/manual/version.tex index a2bc60d6..5a0017a4 100644 --- a/docs/manual/version.tex +++ b/docs/manual/version.tex @@ -1 +1 @@ -1.39.28 (12 November 2006) +1.39.29 (20 November 2006)