From 79c5b890eb8e313a701d5da1987ee736862620da 2014-12-22 22:22:50 From: Bradley M. Kuhn Date: 2014-12-22 22:22:50 Subject: [PATCH] Consolidate copyright notices into single place. Historically, this project used (more-or-less) a file-by-file copyright inventory. This commit ends that practice. The project now has a single toplevel copyright inventory, stored exclusively in comprehensive-gpl-guide.tex (so that it appears also in compiled versions of the Guide as well). The side-effect of this commit is that the parts may no longer be easily publishable separably without (at least) the additional work of copyright notice reconstruction. This may in particular create a challenge for the FSF, who has historically selectively published sections of this Guide as materials for its CLE classes. However, without this change, this Guide will eventually suffer from the inherent problems in maintaining file-by-file copyright inventory. Circumstances simply dictate a single, top-level copyright and license notice for the entire Guide. In addition to consolidation of copyright notices, I've also herein updated my historical copyright notices to properly credit me for my own work done in 2003 through 2005. I've also updated the license notice to reflect the changes made by the previous commit and related issues. --- diff --git a/compliance-guide.tex b/compliance-guide.tex index db549e4faf65853b9deecf8b669a07168f09e784..f0872d47e733d6129148668550582e59d3519de0 100644 --- a/compliance-guide.tex +++ b/compliance-guide.tex @@ -3,35 +3,6 @@ \part{A Practical Guide to GPL Compliance} \label{gpl-compliance-guide} -{\parindent 0in -This part is: \\ -\begin{tabbing} -Copyright \= \copyright{} 2008, 2014 \= \hspace{.2in} Bradley M. Kuhn. \\ -Copyright \= \copyright{} 2014 \> \hspace{.2in} Free Software Foundation, Inc. \\ -Copyright \> \copyright{} 2008, 2014 \> \hspace{.2in} Software Freedom Law Center. \\ -\end{tabbing} - -\vspace{.1in} - -\begin{center} -The copyright holders of this part hereby grant the freedom to copy, modify, -convey, Adapt, and/or redistribute this work under the terms of the Creative -Commons Attribution Share Alike 4.0 International License. A copy of that -license is available at -\url{https://creativecommons.org/licenses/by-sa/4.0/legalcode}. - -\vfill - -This work is primarily composed of the many contributions it -receives as a public, collaborative project. Please -\href{https://gitorious.org/copyleft-org/tutorial/history/master:compliance-guide.tex}{review - its Git logs} for full documentation of all contributions. - -\end{center} -} - -\pagebreak - \chapter*{Executive Summary} This is a guide to effective compliance with the GNU General Public diff --git a/comprehensive-gpl-guide.tex b/comprehensive-gpl-guide.tex index e9bf721f8b9961976fc826fd481ad01bd8da9074..fa9619f451612c48b08afb9443f7547b08e3ebba 100644 --- a/comprehensive-gpl-guide.tex +++ b/comprehensive-gpl-guide.tex @@ -98,28 +98,23 @@ and Guide {\parindent 0in \begin{tabbing} -Copyright \= \copyright{} 2003--2007, 2014 \hspace{1.mm} \= \kill -Copyright \> \copyright{} 2014 \> Bradley M. Kuhn. \\ +Copyright \= \copyright{} 2003--2005, 2008, 2014 \hspace{1.mm} \= \kill +Copyright \> \copyright{} 2003--2005, 2008, 2014 \> Bradley M. Kuhn. \\ Copyright \> \copyright{} 2014 \> Anthony K. Sebro, Jr. \\ -Copyright \= \copyright{} 2014 \> Denver Gingerich \\ -Copyright \= \copyright{} 2003--2007, 2014 \> \hspace{.2in} Free Software Foundation, Inc. \\ +Copyright \= \copyright{} 2014 \> Denver Gingerich. \\ +Copyright \= \copyright{} 2003--2007, 2014 \> Free Software Foundation, Inc. \\ Copyright \> \copyright{} 2008, 2014 \> Software Freedom Law Center. \\ \end{tabbing} \vspace{.3in} -The copyright holders hereby grant the freedom to copy, modify, convey, -Adapt, and/or redistribute this work under the terms of the Creative Commons +The copyright holders grant the freedom to copy, modify, convey, +Adapt, and/or redistribute this work (except +Appendices~\ref{GPLv2-full-text}--\ref{AGPLv3-full-text}) under the terms of the Creative Commons Attribution Share Alike 4.0 International License. A copy of that license is available at \url{https://creativecommons.org/licenses/by-sa/4.0/legalcode}. -Each part of this book, except the appendix, is separately under this same -license, but copyrighted by different entities at different times. Each part -therefore also contains its own copyright and licensing notice. The notice -above is for the entire work, and includes the full copyright and licensing -details, except for the appendix. - -The appendix includes copies of the texts of various licenses published +Appendices~\ref{GPLv2-full-text}--\ref{AGPLv3-full-text} include copies of the texts of various licenses published by the FSF, and they are all licensed under the license, ``Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.''. However, those who seek to make modified versions of @@ -128,10 +123,20 @@ those licenses should note the \vfill -This material is regularly updated by a community of contributors and is -available online at all times at \url{https://copyleft.org/guide/}. Patches +As a public, collaborative project, this Guide is primarily composed of the +many contributions received via its +\href{https://gitorious.org/copyleft-org/tutorial/source/master:CONTRIBUTING.md}{public + contribution process}. Please +\href{https://gitorious.org/copyleft-org/tutorial/history/master}{review its + Git logs} for full documentation of all contributions, and +Appendix~\ref{third-party-citation-list} + contains a list of third-party works from which some material herein was +adapted. + +The most recent version is +available online at \url{https://copyleft.org/guide/}. Patches are indeed welcome to this material. Sources can be found in the Git -repository at: \url{https://gitorious.org/copyleft-org/tutorial/} +repository at \url{https://gitorious.org/copyleft-org/tutorial/}. } \end{center} diff --git a/enforcement-case-studies.tex b/enforcement-case-studies.tex index 0fa1f7a78271be6fb5515cdb454404ec30dcac6f..47796d8b481b26cd1ca0d11ca3a2e309182af4ca 100644 --- a/enforcement-case-studies.tex +++ b/enforcement-case-studies.tex @@ -18,34 +18,6 @@ \part{Case Studies in GPL Enforcement} -{\parindent 0in -This part is: \\ -\begin{tabbing} -Copyright \= \copyright{} 2003, 2004, 2014 \hspace{1mm} \= \hspace{1.mm} \= \kill -Copyright \> \copyright{} 2014 \> Bradley M. Kuhn. \\ -Copyright \> \copyright{} 2014 \> Denver Gingerich \\ -Copyright \> \copyright{} 2003, 2004, 2014 \> Free Software Foundation, Inc. \\ -\end{tabbing} - -\vspace{.2in} - -\begin{center} - -The copyright holders hereby grant the freedom to copy, modify, convey, -Adapt, and/or redistribute this work under the terms of the Creative Commons -Attribution Share Alike 4.0 International License. A copy of that license is -available at \url{https://creativecommons.org/licenses/by-sa/4.0/legalcode}. -\end{center} - -\vfill - -This work is primarily composed of the many contributions it -receives as a public, collaborative project. Please -\href{https://gitorious.org/copyleft-org/tutorial/history/master:enforcement-case-studies.tex}{review - its Git logs} for full documentation of all contributions. - - -} % ===================================================================== % START OF SECOND DAY SEMINAR SECTION % ===================================================================== diff --git a/gpl-lgpl.tex b/gpl-lgpl.tex index 8f706c1ba1661530150ff2c32635c6c2935bbefe..9808c4371d5819a4f255aa689673566e26315ecb 100644 --- a/gpl-lgpl.tex +++ b/gpl-lgpl.tex @@ -28,38 +28,6 @@ \part{Detailed Analysis of the GNU GPL and Related Licenses} \label{gpl-lgpl-part} -{\parindent 0in -\tutorialpartsplit{``Detailed Analysis of the GNU GPL and Related Licenses''}{This part} is: \\ -\begin{tabbing} -Copyright \= \copyright{} 2003--2007, 2014 \hspace{.1mm} \= \kill -Copyright \> \copyright{} 2014 \> Bradley M. Kuhn \\ -Copyright \> \copyright{} 2014 \> Anthony K. Sebro, Jr. \\ -Copyright \> \copyright{} 2003--2007, 2014 \> Free Software Foundation, Inc. \\ -Copyright \> \copyright{} 2014 \> Software Freedom Law Center. -\end{tabbing} - - -\vspace{.2in} - -\begin{center} - -The copyright holders of \tutorialpartsplit{``Detailed Analysis of the GNU GPL and Related Licenses''}{this part} hereby grant the freedom to copy, modify, -convey, Adapt, and/or redistribute this work under the terms of the Creative -Commons Attribution Share Alike 4.0 International License. A copy of that -license is available at -\verb=https://creativecommons.org/licenses/by-sa/4.0/legalcode=. -\end{center} - -\vfill - - -This work is primarily composed of the many contributions it -receives as a public, collaborative project. Please -\href{https://gitorious.org/copyleft-org/tutorial/history/master:gpl-lgpl.tex}{review - its Git logs} for full documentation of all contributions. -} -\pagebreak - \tutorialpartsplit{This tutorial}{This part of the tutorial} gives a comprehensive explanation of the most popular Free Software copyright license, the GNU General Public License (``GNU GPL'', or sometimes just diff --git a/license-texts.tex b/license-texts.tex index 1c1b7f9af7ed7f2168ff40cf5b789d7762f68207..497476988c79fdf46a6cac16c825c1adf88a363f 100644 --- a/license-texts.tex +++ b/license-texts.tex @@ -10,6 +10,7 @@ LGPLv2.1, LGPLv3, and AGPLv3. These are the most commonly used licenses in the GPL family of licenses. \chapter{The GNU General Public License, version 2} +\label{GPLv2-full-text} \begin{center} {\parindent 0in @@ -1745,7 +1746,7 @@ first, please read \texttt{http://www.gnu.org/philosophy/why-not-lgpl.html}. \end{enumerate} \chapter{The Affero General Public License, version 3} - +\label{AGPLv3-full-text} \begin{center} {\parindent 0in diff --git a/third-party-citations.tex b/third-party-citations.tex index ac5f7486eda7858513f0d13e01823b897a8b3e53..4ffbd26fe569c9909dd9f3316f73ee44dd4b3f79 100644 --- a/third-party-citations.tex +++ b/third-party-citations.tex @@ -1,7 +1,5 @@ % attributions.tex -*- LaTeX -*- % Part containing all attributions in one place. -% -% Copyright (C) 2014, Bradley M. Kuhn \chapter{Citations of Incorporated Material from Other Published Works} @@ -19,6 +17,7 @@ documented in the \href{https://gitorious.org/copyleft-org/tutorial/history/master}{Git logs} of the project. +\label{third-party-citation-list} \begin{itemize} \item \textit{Detailed Analysis of the GNU GPL and Related Licenses}, written by Bradley M. Kuhn, Daniel B.~Ravicher, and John Sullivan and published by the Free Software Foundation for its CLE courses on 2004-01-20,