From ebc7ec5bb2fb3039ba2ab4e84e97ed29ab1757ab Mon Sep 17 00:00:00 2001 From: Tobias Ludwig Maier Date: Fri, 22 Apr 2022 11:39:41 +0200 Subject: [PATCH 1/3] Change Licenese of gem from GPL 3.0 to dual-license GPL 3.0 and BSD-2-Clause --- History.txt | 2 ++ LICENSE | 16 ++++++++++++++++ README.md | 2 +- bibtex-ruby.gemspec | 2 +- lib/bibtex.rb | 4 ++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/History.txt b/History.txt index 0e631f0..7e49390 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,5 @@ +* Dual-license bibtex-ruby under GPL-3.0 and BSD-2-Clause + 6.0.0 / 2021-01-07 ================== diff --git a/LICENSE b/LICENSE index ce67fea..036447d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,19 @@ +Dual-Licensed under GPL-3.0 and BSD-2-Clause + +--- + +Copyright 2010 Sylvester Keil + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +--- + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/README.md b/README.md index 9e864d3..ef4d920 100644 --- a/README.md +++ b/README.md @@ -609,5 +609,5 @@ Copyright 2011-2015 [Sylvester Keil](http://sylvester.keil.or.at/). Kudos to all [contributors](https://github.com/inukshuk/bibtex-ruby/contributors) who have made BibTeX-Ruby possible. -This software is distributed under the terms and conditions of the GNU GPL. +This software is dual-licensed under GPL-3.0 and BSD-2-Clause. See LICENSE for details. diff --git a/bibtex-ruby.gemspec b/bibtex-ruby.gemspec index a994d77..254dad4 100644 --- a/bibtex-ruby.gemspec +++ b/bibtex-ruby.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.authors = ['Sylvester Keil'] s.email = ['sylvester@keil.or.at'] s.homepage = 'http://inukshuk.github.com/bibtex-ruby' - s.license = 'GPL-3.0' + s.licenses = ['GPL-3.0', 'BSD-2-Clause'] s.summary = 'A BibTeX parser, converter and API for Ruby.' s.description = <<-END_DESCRIPTION.gsub(/^\s+/, '') diff --git a/lib/bibtex.rb b/lib/bibtex.rb index 9d88976..ac7fd89 100644 --- a/lib/bibtex.rb +++ b/lib/bibtex.rb @@ -32,8 +32,8 @@ # +Preamble+, +Comment+, and +Entry+. # # Author:: {Sylvester Keil}[http://sylvester.keil.or.at] -# Copyright:: Copyright (c) 2010-2014 Sylvester Keil -# License:: GNU GPL 3.0 +# Copyright:: Copyright (c) 2010-2022 Sylvester Keil +# License: GNU GPL 3.0 and BSD-2-Clause # module BibTeX # From 7de523b9d79766961ec982a4ab793ba40ce8ce58 Mon Sep 17 00:00:00 2001 From: Tobias Ludwig Maier Date: Fri, 22 Apr 2022 12:01:17 +0200 Subject: [PATCH 2/3] Fix minor typo --- lib/bibtex.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bibtex.rb b/lib/bibtex.rb index ac7fd89..636f310 100644 --- a/lib/bibtex.rb +++ b/lib/bibtex.rb @@ -33,7 +33,7 @@ # # Author:: {Sylvester Keil}[http://sylvester.keil.or.at] # Copyright:: Copyright (c) 2010-2022 Sylvester Keil -# License: GNU GPL 3.0 and BSD-2-Clause +# License:: GNU GPL 3.0 and BSD-2-Clause # module BibTeX # From 82196bd61ad7d24436990ec38569d277a0e72137 Mon Sep 17 00:00:00 2001 From: Sylvester Keil Date: Fri, 22 Apr 2022 14:27:34 +0200 Subject: [PATCH 3/3] Credit all contributors There's currently no contributor list in the repository, but GitHub provides one at: https://github.com/inukshuk/bibtex-ruby/graphs/contributors --- LICENSE | 2 +- README.md | 3 --- bibtex-ruby.gemspec | 5 ++--- features/entries.feature | 2 +- lib/bibtex.rb | 21 +-------------------- lib/bibtex/bibliography.rb | 18 ------------------ lib/bibtex/bibtex.y | 17 ----------------- lib/bibtex/elements.rb | 18 ------------------ lib/bibtex/entry.rb | 18 ------------------ lib/bibtex/extensions.rb | 18 ------------------ lib/bibtex/lexer.rb | 18 ------------------ lib/bibtex/names.rb | 18 ------------------ lib/bibtex/names.y | 17 ----------------- lib/bibtex/replaceable.rb | 18 ------------------ lib/bibtex/utilities.rb | 18 ------------------ lib/bibtex/value.rb | 18 ------------------ lib/bibtex/version.rb | 18 ------------------ test/fixtures/bibdesk.bib | 2 +- 18 files changed, 6 insertions(+), 243 deletions(-) diff --git a/LICENSE b/LICENSE index 036447d..8d70ee7 100644 --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ Dual-Licensed under GPL-3.0 and BSD-2-Clause --- -Copyright 2010 Sylvester Keil +Copyright 2010-2022 The BibTeX-Ruby Contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index ef4d920..65571dd 100644 --- a/README.md +++ b/README.md @@ -603,9 +603,6 @@ To execute the test suite continuously while you're working run: Credits ------- - -Copyright 2011-2015 [Sylvester Keil](http://sylvester.keil.or.at/). - Kudos to all [contributors](https://github.com/inukshuk/bibtex-ruby/contributors) who have made BibTeX-Ruby possible. diff --git a/bibtex-ruby.gemspec b/bibtex-ruby.gemspec index 254dad4..a468319 100644 --- a/bibtex-ruby.gemspec +++ b/bibtex-ruby.gemspec @@ -8,9 +8,8 @@ Gem::Specification.new do |s| s.version = BibTeX::Version::STRING.dup s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.4.0' - s.authors = ['Sylvester Keil'] - s.email = ['sylvester@keil.or.at'] - s.homepage = 'http://inukshuk.github.com/bibtex-ruby' + s.authors = ['The BibTeX-Ruby Contributors'] + s.homepage = 'https://github.com/inukshuk/bibtex-ruby' s.licenses = ['GPL-3.0', 'BSD-2-Clause'] s.summary = 'A BibTeX parser, converter and API for Ruby.' diff --git a/features/entries.feature b/features/entries.feature index d0c099a..c587632 100644 --- a/features/entries.feature +++ b/features/entries.feature @@ -10,7 +10,7 @@ Feature: Parse BibTeX preambles %% http://bibdesk.sourceforge.net/ - %% Created for Sylvester Keil at 2010-08-05 10:07:07 +0200 + %% Created at 2010-08-05 10:07:07 +0200 %% Saved with string encoding Unicode (UTF-8) diff --git a/lib/bibtex.rb b/lib/bibtex.rb index 636f310..85e468e 100644 --- a/lib/bibtex.rb +++ b/lib/bibtex.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - require 'digest/md5' require 'forwardable' require 'logger' @@ -31,8 +13,7 @@ # an API to the individual BibTeX objects: +String+, # +Preamble+, +Comment+, and +Entry+. # -# Author:: {Sylvester Keil}[http://sylvester.keil.or.at] -# Copyright:: Copyright (c) 2010-2022 Sylvester Keil +# Copyright:: Copyright (c) 2010-2022 The BibTeX-Ruby Contributors # License:: GNU GPL 3.0 and BSD-2-Clause # module BibTeX diff --git a/lib/bibtex/bibliography.rb b/lib/bibtex/bibliography.rb index 1b06146..039e7fe 100644 --- a/lib/bibtex/bibliography.rb +++ b/lib/bibtex/bibliography.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX # # The Bibliography class models a BibTeX bibliography; diff --git a/lib/bibtex/bibtex.y b/lib/bibtex/bibtex.y index e4bab0a..d222b6b 100644 --- a/lib/bibtex/bibtex.y +++ b/lib/bibtex/bibtex.y @@ -1,20 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2011 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ # # A BibTeX grammar for the parser generator +racc+ # diff --git a/lib/bibtex/elements.rb b/lib/bibtex/elements.rb index 5ac366a..aca0161 100644 --- a/lib/bibtex/elements.rb +++ b/lib/bibtex/elements.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX # # The base class for BibTeX objects. diff --git a/lib/bibtex/entry.rb b/lib/bibtex/entry.rb index 4ca8bb0..34a7634 100644 --- a/lib/bibtex/entry.rb +++ b/lib/bibtex/entry.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX # # Represents a regular BibTeX entry. diff --git a/lib/bibtex/extensions.rb b/lib/bibtex/extensions.rb index 8e635c2..b8fca3a 100644 --- a/lib/bibtex/extensions.rb +++ b/lib/bibtex/extensions.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2011 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX module Extensions end diff --git a/lib/bibtex/lexer.rb b/lib/bibtex/lexer.rb index ff57337..293c584 100644 --- a/lib/bibtex/lexer.rb +++ b/lib/bibtex/lexer.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - require 'strscan' module BibTeX diff --git a/lib/bibtex/names.rb b/lib/bibtex/names.rb index b5c70a1..c91f9ba 100644 --- a/lib/bibtex/names.rb +++ b/lib/bibtex/names.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - require 'forwardable' module BibTeX diff --git a/lib/bibtex/names.y b/lib/bibtex/names.y index 4af9a83..ac610e0 100644 --- a/lib/bibtex/names.y +++ b/lib/bibtex/names.y @@ -1,20 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2011 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ # # A BibTeX Names grammar for the parser generator +racc+ # diff --git a/lib/bibtex/replaceable.rb b/lib/bibtex/replaceable.rb index c2e113c..425fa0e 100644 --- a/lib/bibtex/replaceable.rb +++ b/lib/bibtex/replaceable.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX # # The Replaceable module provides methods that expose a Value attribute diff --git a/lib/bibtex/utilities.rb b/lib/bibtex/utilities.rb index 922cde5..d3cbfcf 100644 --- a/lib/bibtex/utilities.rb +++ b/lib/bibtex/utilities.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2011 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX class << self # Opens a BibTeX file or URI and returns a corresponding +Bibliography+ diff --git a/lib/bibtex/value.rb b/lib/bibtex/value.rb index eea62e2..4417dde 100644 --- a/lib/bibtex/value.rb +++ b/lib/bibtex/value.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - require 'forwardable' module BibTeX diff --git a/lib/bibtex/version.rb b/lib/bibtex/version.rb index 209a908..b9c5470 100644 --- a/lib/bibtex/version.rb +++ b/lib/bibtex/version.rb @@ -1,21 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#++ - module BibTeX module Version MAJOR = 6 diff --git a/test/fixtures/bibdesk.bib b/test/fixtures/bibdesk.bib index fe66180..6ee974b 100644 --- a/test/fixtures/bibdesk.bib +++ b/test/fixtures/bibdesk.bib @@ -2,7 +2,7 @@ %% http://bibdesk.sourceforge.net/ -%% Created for Sylvester Keil at 2010-08-05 10:07:07 +0200 +%% Created at 2010-08-05 10:07:07 +0200 %% Saved with string encoding Unicode (UTF-8)