diff options
author | Eric Wong <e@80x24.org> | 2016-01-06 20:34:54 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-01-07 01:33:33 +0000 |
commit | 6512f0e38be76b7ffa2f19fb41aee07cdda5b41c (patch) | |
tree | 9af35b35b8af2b9de8aa899cfa63202937bcf250 | |
parent | fd5f71b2548891b1692425ca861b557faca9e404 (diff) | |
download | olddoc-6512f0e38be76b7ffa2f19fb41aee07cdda5b41c.tar.gz |
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
-rw-r--r-- | Documentation/GNUmakefile | 4 | ||||
-rw-r--r-- | GNUmakefile | 4 | ||||
-rw-r--r-- | Rakefile | 4 | ||||
-rw-r--r-- | lib/olddoc.rb | 4 | ||||
-rw-r--r-- | lib/olddoc/gemspec.rb | 2 | ||||
-rw-r--r-- | lib/olddoc/history.rb | 4 | ||||
-rw-r--r-- | lib/olddoc/merge.rb | 4 | ||||
-rw-r--r-- | lib/olddoc/news_atom.rb | 4 | ||||
-rw-r--r-- | lib/olddoc/news_rdoc.rb | 6 | ||||
-rw-r--r-- | lib/olddoc/prepare.rb | 4 | ||||
-rw-r--r-- | lib/olddoc/readme.rb | 4 | ||||
-rw-r--r-- | lib/oldweb.rb | 4 | ||||
-rw-r--r-- | 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 @@ -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 |