tablecheck · johnnyshields · Nov 8, 2023 · Nov 8, 2023 · Nov 8, 2023 · Nov 8, 2023
diff --git a/.yardopts b/.yardopts
@@ -4,7 +4,6 @@
 --no-private
 -
 CONTRIBUTING.md
-COPYING
 LICENSE
 README.md
 CHANGELOG.md
diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
@@ -1,56 +1,15 @@
-Prawn is copyrighted free software produced by Gregory Brown along with 
-community contributions.  See git log for authorship information.
+Prawn may be used under any of the following licenses:
 
-Licensing terms follow:
+1. The Prawn License (see: LICENSE-PRAWN), which is similar to
+   Matz's original licensing terms for Ruby.
+2. GPLv2 (see: LICENSE-GPLv2)
+3. GPLv3 (see: LICENSE-GPLv3)
 
-You can redistribute Prawn and/or modify it under either the terms of the GPLv2
-or GPLv3 (see GPLv2 and GPLv3 files), or the conditions below:
+The maintainers of this repository plan to migrate to the MIT License
+(see: LICENSE-MIT) in the future. Effective November 8, 2023, by
+contributing to this repository, you consent to license your contribution
+under the MIT License.
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-    modifications to Usenet or an equivalent medium, or by allowing
-    the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-    together with instructions (in the manual page or equivalent)
-    on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-    the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial). 
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+For clarity, the MIT License has not yet been adopted for use in this
+repository. Refer to the following issue for migration status:
+https://github.com/tablecheck/prawn-continued/issues/4
diff --git a/GPLv2 → LICENSE-GPLv2 b/GPLv2 → LICENSE-GPLv2
diff --git a/GPLv3 → LICENSE-GPLv3 b/GPLv3 → LICENSE-GPLv3
diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -0,0 +1,21 @@
+Copyright (c) 2008-2023 Gregory Brown
+Copyright (c) 2023 onwards John Shields
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSE-PRAWN b/LICENSE-PRAWN
@@ -0,0 +1,56 @@
+Prawn is copyrighted free software produced by Gregory Brown along with
+community contributions. See git log for authorship information.
+
+Licensing terms follow:
+
+You can redistribute Prawn and/or modify it under either the terms of the GPLv2
+or GPLv3 (see GPLv2 and GPLv3 files), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+          modifications to Usenet or an equivalent medium, or by allowing
+          the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+          with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+          the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
diff --git a/prawn.gemspec b/prawn.gemspec
@@ -9,30 +9,35 @@ Gem::Specification.new do |spec|
   spec.version = Prawn::VERSION
   spec.platform = Gem::Platform::RUBY
   spec.summary = 'A fast and nimble PDF generator for Ruby'
-
-  # spec.cert_chain = ['certs/pointlessone.pem']
-  # if $PROGRAM_NAME.end_with? 'gem'
-  #   spec.signing_key = File.expand_path('~/.gem/gem-private_key.pem')
-  # end
-
   spec.files = Dir.glob('{examples,lib,spec,manual}/**/**/*') +
     Dir.glob('data/fonts/{MustRead.html,*.afm}') +
     [
-      'Rakefile', 'prawn.gemspec', 'Gemfile',
-      'COPYING', 'LICENSE', 'GPLv2', 'GPLv3',
+      'Rakefile',
+      'prawn.gemspec',
+      'Gemfile',
+      'LICENSE',
+      'LICENSE-GPLv2',
+      'LICENSE-GPLv3',
+      'LICENSE-MIT',
+      'LICENSE-PRAWN',
       '.yardopts'
     ]
   spec.require_path = 'lib'
   spec.required_ruby_version = '>= 2.6'
   spec.required_rubygems_version = '>= 1.3.6'
-
   spec.authors = [
-    'Gregory Brown', 'Brad Ediger', 'Daniel Nelson', 'Jonathan Greenberg',
+    'Gregory Brown',
+    'Brad Ediger',
+    'Daniel Nelson',
+    'Jonathan Greenberg',
     'James Healy'
   ]
   spec.email = [
-    '[email protected]', '[email protected]', '[email protected]',
-    '[email protected]', '[email protected]'
+    '[email protected]',
+    '[email protected]',
+    '[email protected]',
+    '[email protected]',
+    '[email protected]'
   ]
   spec.licenses = %w[PRAWN GPL-2.0 GPL-3.0]
 
@@ -46,7 +51,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('prawn-manual_builder', '>= 0.3.0')
 
   spec.homepage = 'http://prawnpdf.org'
-  spec.description = <<END_DESC
-  Prawn is a fast, tiny, and nimble PDF generator for Ruby
-END_DESC
+  spec.description = 'Prawn is a fast, tiny, and nimble PDF generator for Ruby'
 end