diff options
| -rw-r--r-- | LICENSE | 21 | ||||
| -rw-r--r-- | zbatery.gemspec | 2 |
2 files changed, 13 insertions, 10 deletions
@@ -1,17 +1,20 @@ -\Zbatery is copyrighted Free Software by all contributors, see the -logs in revision control for names and email addresses of all of them. +zbatery is copyrighted free software by all contributors, see logs in +revision control for names and email addresses of all of them. You can redistribute it and/or modify it under either the terms of the GNU General Public License (GPL) as published by the Free Software -Foundation (FSF), version {3.0}[http://www.gnu.org/licenses/gpl-3.0.txt] -or version {2.0}[http://www.gnu.org/licenses/gpl-2.0.txt] -or the Ruby-specific license terms (see below). +Foundation (FSF), either version 2 of the License, or (at your option) +any later version. We currently prefer the GPLv3 or later for +derivative works, but the GPLv2 is fine. -The \Zbatery project leader (Eric Wong) reserves the right to add future -versions of the GPL (and no other licenses) as published by the FSF to -the licensing terms. +The complete texts of the GPLv2 and GPLv3 are below: +GPLv2 - http://www.gnu.org/licenses/gpl-2.0.txt +GPLv3 - http://www.gnu.org/licenses/gpl-3.0.txt -=== Ruby-specific terms (if you're not using the GPLv2/GPLv3) +You may (against our _preference_) also use the Ruby 1.8 license terms +which we inherited from the original Mongrel project when we forked it: + +=== Ruby 1.8-specific terms (if you're not using the GPL) 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 diff --git a/zbatery.gemspec b/zbatery.gemspec index 76df6b1..40e1b6d 100644 --- a/zbatery.gemspec +++ b/zbatery.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.add_development_dependency(%q<wrongdoc>, "~> 1.6") s.add_development_dependency(%q<isolate>, "~> 3.1") - # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems + s.licenses = %w(GPLv2+ Ruby) end |