[PATCH] dep5.mdwn: Fine tune Copyright header description and examples
** CC: DEP5 drivers
** Here is a small patch to update the DEP5's Copyright examples
** See also FSF copyright year use recommendations at
http://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html
In "Files paragraph (Repeatable)"
- Drop duplicate word "Copyright"; already included in header "Copyright:"
- Use YYYY-YYYY range.
- Enclose examples in markdows backticks i.e. <pre>.
- Clean up extra whitespaces from empty lines.
In "Standalone License Paragraph (Optional, Repeatable)"
- Canonicalize "Copyright:" header to use 1 space indentation
as used in other headers.
- Drop duplicate word "Copyright"; already included in header "Copyright:"
- Clean up extra whitespaces from empty lines.
- Add email addresses to names of copyright holders.
In "Complex"
- Canonicalize "Copyright:" header to use 1 space indentation
as used in other headers.
- Drop unused comma after year element in copyright holder lines.
Comma would be used with multiple discrete years like in
YYYY, YYYY+3, YYYY+5; see FSF recommendation.
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
deps/dep5.mdwn | 63 +++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/deps/dep5.mdwn b/deps/dep5.mdwn
index 4bb4ef6..ae711c3 100644
--- a/deps/dep5.mdwn
+++ b/deps/dep5.mdwn
@@ -234,19 +234,19 @@ ## Files paragraph (Repeatable)
individual file, and years of publication for one copyright holder may
be gathered together. For example, if file A has:
- Copyright 2008 John Smith
- Copyright 2009 Angela Watts
+ `Copyright (C) 2008 John Smith`
+ `Copyright (C) 2009 Angela Watts`
and file B has:
- Copyright 2010 Angela Watts
+ `Copyright (C) 2010 Angela Watts`
- the Copyright field for a stanza covering both file A and file B need
+ the "Copyright:" field for a stanza covering both file A and file B need
contain only:
- Copyright 2008 John Smith
- Copyright 2009, 2010 Angela Watts
-
+ `2009-2010 Angela Watts`
+ `2008 John Smith`
+
The Copyright field may contain the original copyright statement
copied exactly (including the word "Copyright"), or it can
shorten the text, as long as it does not sacrifice information.
@@ -308,15 +308,15 @@ ## Files paragraph (Repeatable)
Files: *
Copyright: 1975-2010 Ulla Upstream
License: GPL-2+
-
+
Files: debian/*
Copyright: 2010 Daniela Debianizer
License: GPL-2+
-
+
Files: debian/patches/fancy-feature
Copyright: 2010 Daniela Debianizer
License: GPL-3+
-
+
Files: */*.1
Copyright: 2010 Manuela Manpager
License: GPL-2+
@@ -337,16 +337,17 @@ ## Standalone License Paragraph (Optional, Repeatable)
Example 1 (tri-licensed files).
Files: src/js/editline/*
- Copyright: 1993, John Doe
- 1993, Joe Average
+ Copyright:
+ 1993 John Doe <jdoe@example.com>,
+ 1993 Joe Average <joe@example.org>
License: MPL-1.1 or GPL-2 or LGPL-2.1
-
+
License: MPL-1.1
[LICENSE TEXT]
-
+
License: GPL-2
[LICENSE TEXT]
-
+
License: LGPL-2.1
[LICENSE TEXT]
@@ -354,12 +355,13 @@ ## Standalone License Paragraph (Optional, Repeatable)
Example 2 (recurrent license).
Files: src/js/editline/*
- Copyright: 1993, John Doe
- 1993, Joe Average
+ Copyright:
+ 1993 John Doe <jdoe@example.com>
+ 1993 Joe Average <joe@example.org>
License: MPL-1.1
Files: src/js/fdlibm/*
- Copyright: 1993, J-Random Corporation
+ Copyright: 1993 J-Random Corporation <corp@example.com>
License: MPL-1.1
License: MPL-1.1
@@ -599,7 +601,7 @@ ## Simple
Source: ftp://ftp.example.com/pub/games
Files: *
- Copyright: Copyright 1998 John Doe <jdoe@example.com>
+ Copyright: 1998 John Doe <jdoe@example.com>
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
@@ -623,7 +625,7 @@ ## Simple
`/usr/share/common-licenses/GPL-2'.
Files: debian/*
- Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
+ Copyright: 1998 Jane Smith <jsmith@example.net>
License:
[LICENSE TEXT]
@@ -638,15 +640,16 @@ ## Complex
Source: http://www.example.com/code/venus
Files: *
- Copyright: 2008, John Doe <jdoe@example.com>
- 2007, Jane Smith <jsmith@example.org>
- 2007, Joe Average <joe@example.org>
- 2007, J. Random User <jr@users.example.com>
+ Copyright:
+ 2008 John Doe <jdoe@example.com>
+ 2007 Jane Smith <jsmith@example.org>
+ 2007 Joe Average <joe@example.org>
+ 2007 J. Random User <jr@users.example.com>
License: PSF-2
[LICENSE TEXT]
Files: debian/*
- Copyright: 2008, Dan Developer <dan@debian.example.com>
+ Copyright: 2008 Dan Developer <dan@debian.example.com>
License:
Copying and distribution of this package, with or without
modification, are permitted in any medium without royalty
@@ -654,27 +657,27 @@ ## Complex
preserved.
Files: debian/patches/theme-diveintomark.patch
- Copyright: 2008, Joe Hacker <hack@example.org>
+ Copyright: 2008 Joe Hacker <hack@example.org>
License: GPL-2+
[LICENSE TEXT]
Files: planet/vendor/compat_logging/*
- Copyright: 2002, Mark Smith <msmith@example.org>
+ Copyright: 2002 Mark Smith <msmith@example.org>
License: MIT
[LICENSE TEXT]
Files: planet/vendor/httplib2/*
- Copyright: 2006, John Brown <brown@example.org>
+ Copyright: 2006 John Brown <brown@example.org>
License: MIT2
Unspecified MIT style license.
Files: planet/vendor/feedparser.py
- Copyright: 2007, Mike Smith <mike@example.org>
+ Copyright: 2007 Mike Smith <mike@example.org>
License: PSF-2
[LICENSE TEXT]
Files: planet/vendor/htmltmpl.py
- Copyright: 2004, Thomas Brown <coder@example.org>
+ Copyright: 2004 Thomas Brown <coder@example.org>
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
--
1.7.4.1
Reply to: