commit:     56399ad6e320831aadeb1cb62817f57e77e8ea1d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 17 09:21:13 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 12:51:51 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=56399ad6

glep-0076: Update copyright attribution section.

Consider input from mailing lists and IRC:
- Require a license notice too.
- Assets like images won't allow for a notice in the file (mrueg).
- Don't rely on line counting, but state that the main copyright
  holder must be listed.

Also some of the ideas of this section have been checked against
GNU maintainer documentation:
https://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html

 glep-0076.rst | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 6066019..c93ca04 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-06-10
+Last-Modified: 2018-06-17
 Post-History: 2018-06-10
 Content-Type: text/x-rst
 ---
@@ -174,18 +174,23 @@ Source Development Labs, Inc. in 2005 under a 
CC-BY-SA-2.5 License.
 Copyright Attribution
 ---------------------
 
-All files included in Gentoo projects must contain an appropriate
-copyright notice, as defined by this policy.
+All copyrightable files included in Gentoo projects must contain
+appropriate copyright and license notices, as defined by this policy.
+For files in textual format, these notices normally appear near the
+top of the file.  When technical limitations do not allow for text
+notices in the file itself (e.g., for binary image file formats),
+copyright and license can be stated in an accompanying text file in
+the same directory.
 
-A proper copyright notice appears near the top of the file, and reads::
+A proper copyright notice reads::
 
-    Copyright YEARS LARGEST-CONTRIBUTOR [OTHER-CONTRIBUTORS] and others
+    Copyright YEARS MAIN-CONTRIBUTOR [OTHER-CONTRIBUTOR]... [and others]
 
-The largest contributor is whatever entity owns copyright to some
-portion of the largest number of lines in the file.  Additional
-contributors can be listed, but this is neither required nor
-recommended.  The "and others" text may be omitted if the explicitly
-listed contributors hold copyright to the entire file.
+It must list the main copyright holder, who is usually the original
+author, or the contributor holding copyright to the largest portion
+of the file.  Additional copyright holders can be listed, but this is
+normally not required.  The "and others" text may be omitted if the
+explicitly listed contributors hold copyright to the entire file.
 
 Anyone finding a file out of compliance should file a bug against the
 associated project/package providing as much information as possible.
@@ -291,8 +296,8 @@ Acknowledgements
 
 Many people have participated in invaluable discussions on this GLEP.
 In particular, the authors would like to thank David Abbott,
-Roy Bamford, Kristian Fiskerstrand, Andreas K. Hüttel, Matija Šuklje,
-Matthew Thode, and Alec Warner for their input.
+Roy Bamford, Kristian Fiskerstrand, Andreas K. Hüttel, Manuel Rüger,
+Matija Šuklje, Matthew Thode, and Alec Warner for their input.
 
 
 References

Reply via email to