[PATCH 2/4] copyright updates for 2016

olddoc user/dev discussion/patches/bugs/etc
 help / color / mirror / code / Atom feed

From: Eric Wong <e@80x24.org>
To: olddoc-public@80x24.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH 2/4] copyright updates for 2016
Date: Thu,  7 Jan 2016 01:36:34 +0000	[thread overview]
Message-ID: <20160107013636.9998-3-e@80x24.org> (raw)
In-Reply-To: <20160107013636.9998-1-e@80x24.org>

While we're at it, switch to the shorter, SPDX-approved "GPL-3.0+"
identifier instead of the more verbose "GPLv3 or later" for consistency.

The formatting changed slightly to allow us to use the update-copyright
script in gnulib[1] In the future:

	git ls-files | UPDATE_COPYRIGHT_HOLDER='all contributors' \
		UPDATE_COPYRIGHT_USE_INTERVALS=2 \
		xargs /path/to/gnulib/build-aux/update-copyright

[1] git://git.savannah.gnu.org/gnulib.git
---
 Documentation/GNUmakefile | 4 ++--
 GNUmakefile               | 4 ++--
 Rakefile                  | 4 ++--
 lib/olddoc.rb             | 4 ++--
 lib/olddoc/gemspec.rb     | 2 ++
 lib/olddoc/history.rb     | 4 ++--
 lib/olddoc/merge.rb       | 4 ++--
 lib/olddoc/news_atom.rb   | 4 ++--
 lib/olddoc/news_rdoc.rb   | 6 +++---
 lib/olddoc/prepare.rb     | 4 ++--
 lib/olddoc/readme.rb      | 4 ++--
 lib/oldweb.rb             | 4 ++--
 olddoc.gemspec            | 4 ++--
 13 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 5e47833..0de5043 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 all::
 
 INSTALL = install
diff --git a/GNUmakefile b/GNUmakefile
index 1087882..f67cab6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 all::
 pkg = olddoc
 RUBY = ruby
diff --git a/Rakefile b/Rakefile
index a466d6c..1cbd0f9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'tempfile'
 include Rake::DSL
 task :rsync_docs do
diff --git a/lib/olddoc.rb b/lib/olddoc.rb
index 18495e2..1621f85 100644
--- a/lib/olddoc.rb
+++ b/lib/olddoc.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 module Olddoc
   VERSION = '1.1.2'
 
diff --git a/lib/olddoc/gemspec.rb b/lib/olddoc/gemspec.rb
index 73382ab..f5f008d 100644
--- a/lib/olddoc/gemspec.rb
+++ b/lib/olddoc/gemspec.rb
@@ -1,3 +1,5 @@
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # helper methods for gemspecs
 module Olddoc::Gemspec
   include Olddoc::Readme
diff --git a/lib/olddoc/history.rb b/lib/olddoc/history.rb
index b817d2d..595994d 100644
--- a/lib/olddoc/history.rb
+++ b/lib/olddoc/history.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'uri'
 
 module Olddoc::History
diff --git a/lib/olddoc/merge.rb b/lib/olddoc/merge.rb
index da5bd07..b5dae65 100644
--- a/lib/olddoc/merge.rb
+++ b/lib/olddoc/merge.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 class Olddoc::Merge
   def initialize(opts)
diff --git a/lib/olddoc/news_atom.rb b/lib/olddoc/news_atom.rb
index 7c63db2..a093e64 100644
--- a/lib/olddoc/news_atom.rb
+++ b/lib/olddoc/news_atom.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 require 'builder'
 
 module Olddoc::NewsAtom
diff --git a/lib/olddoc/news_rdoc.rb b/lib/olddoc/news_rdoc.rb
index cc51bec..e8c6a34 100644
--- a/lib/olddoc/news_rdoc.rb
+++ b/lib/olddoc/news_rdoc.rb
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+#
 require 'tempfile'
 
 module Olddoc::NewsRdoc
diff --git a/lib/olddoc/prepare.rb b/lib/olddoc/prepare.rb
index 1ed66a0..f42bd04 100644
--- a/lib/olddoc/prepare.rb
+++ b/lib/olddoc/prepare.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 require 'uri'
 class Olddoc::Prepare
diff --git a/lib/olddoc/readme.rb b/lib/olddoc/readme.rb
index e593517..423d18b 100644
--- a/lib/olddoc/readme.rb
+++ b/lib/olddoc/readme.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 
 # helpers for parsing the top-level README file
 module Olddoc::Readme
diff --git a/lib/oldweb.rb b/lib/oldweb.rb
index 12ce876..af62050 100644
--- a/lib/oldweb.rb
+++ b/lib/oldweb.rb
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # Loosely derived from Darkfish in the main rdoc distribution
 require 'rdoc'
 require 'erb'
diff --git a/olddoc.gemspec b/olddoc.gemspec
index 79f4579..def2265 100644
--- a/olddoc.gemspec
+++ b/olddoc.gemspec
@@ -1,5 +1,5 @@
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 $LOAD_PATH << 'lib'
 require 'olddoc'
 extend Olddoc::Gemspec
-- 
EW

next prev parent reply	other threads:[~2016-01-07  1:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-07  1:36 [PATCH 0/4] bunch of updates for 1.2 Eric Wong
2016-01-07  1:36 ` [PATCH 1/4] bold class bar to highlight current page Eric Wong
2016-01-07  1:36 ` Eric Wong [this message]
2016-01-07  1:36 ` [PATCH 3/4] tail: shorten the footer section Eric Wong
2016-01-07  1:36 ` [PATCH 4/4] head: use old-style <meta> tags for compatibility Eric Wong
2016-01-07  3:37 ` [PATCH 5/4] nodoc some internals Eric Wong

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:5e47833 dfblob:1087882 dfblob:a466d6c dfblob:18495e2
dfblob:73382ab dfblob:b817d2d dfblob:da5bd07 dfblob:7c63db2
dfblob:cc51bec dfblob:1ed66a0 dfblob:e593517 dfblob:12ce876
dfblob:79f4579 dfblob:0de5043 dfblob:f67cab6 dfblob:1cbd0f9
dfblob:1621f85 dfblob:f5f008d dfblob:595994d dfblob:b5dae65
dfblob:a093e64 dfblob:e8c6a34 dfblob:f42bd04 dfblob:423d18b
dfblob:af62050 dfblob:def2265
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://80x24.org/olddoc/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160107013636.9998-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=olddoc-public@80x24.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://80x24.org/olddoc.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).