From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, URIBL_BLOCKED shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: olddoc-public@80x24.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F38B420209; Thu, 7 Jan 2016 01:36:39 +0000 (UTC) From: Eric Wong To: olddoc-public@80x24.org Cc: Eric Wong Subject: [PATCH 2/4] copyright updates for 2016 Date: Thu, 7 Jan 2016 01:36:34 +0000 Message-Id: <20160107013636.9998-3-e@80x24.org> In-Reply-To: <20160107013636.9998-1-e@80x24.org> References: <20160107013636.9998-1-e@80x24.org> List-Id: 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 +# License: GPL-3.0+ # 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) - +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ +# 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ # 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ # 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 -# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) +# Copyright (C) 2015-2016 all contributors +# License: GPL-3.0+ $LOAD_PATH << 'lib' require 'olddoc' extend Olddoc::Gemspec -- EW