From 2dd4c5c457fb658b5b85e20c5ec23c14ab5834de Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 12 May 2014 06:43:44 +0000 Subject: relax license to allow LGPLv2.1 or later In case I'm hit by a bus, the lesser evil is to allow the FSF to update our license than to be stuck as LGPLv3-only in the future. Some documentation/gemspec formatting updates while I'm at it. --- LICENSE | 8 +++----- README | 8 ++++---- clogger.gemspec | 9 +++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index af42653..5b925e7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,12 @@ -\Clogger is copyrighted Free Software by all contributors, see logs in +clogger 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 the terms of the GNU Lesser General Public License (LGPL) as published by the Free Software Foundation, version {2.1}[http://www.gnu.org/licenses/lgpl-2.1.txt] or -or {3}[http://www.gnu.org/licenses/lgpl-3.0.txt] (see link:COPYING). -The \Clogger project leader (Eric Wong) reserves the right to -relicense \Clogger under future versions of the LGPL. +(at your option) any later version. -\Clogger is distributed in the hope that it will be useful, but WITHOUT +clogger 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 Lesser General Public License for more details. diff --git a/README b/README index 8685921..e125b6f 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -= \Clogger - configurable request logging for Rack += clogger - configurable request logging for Rack -\Clogger is Rack middleware for logging HTTP requests. The log format +clogger is Rack middleware for logging HTTP requests. The log format is customizable so you can specify exactly which fields to log. == FEATURES @@ -19,7 +19,7 @@ is customizable so you can specify exactly which fields to log. all bytes in the range of \x00-\x1F * multi-instance capable and (optionally) reentrant. You can use - \Clogger in a multi-threaded server, and even multiple Cloggers logging + clogger in a multi-threaded server, and even multiple cloggers logging to different locations and different formats in the same process. * Pure Ruby version for non-MRI versions of Ruby (or via CLOGGER_PURE=1 @@ -28,7 +28,7 @@ is customizable so you can specify exactly which fields to log. == SYNOPSIS -\Clogger may be loaded as Rack middleware in your config.ru: +clogger may be loaded as Rack middleware in your config.ru: # ENV['CLOGGER_PURE'] = '1' # uncomment to disable C extension require "clogger" diff --git a/clogger.gemspec b/clogger.gemspec index aed15f8..8ad26d0 100644 --- a/clogger.gemspec +++ b/clogger.gemspec @@ -9,22 +9,19 @@ Gem::Specification.new do |s| s.version = ENV["VERSION"].dup s.homepage = Wrongdoc.config[:rdoc_url] s.authors = ["cloggers"] - s.date = Time.now.utc.strftime('%Y-%m-%d') s.description = readme_description s.email = %q{clogger@librelist.org} s.extra_rdoc_files = extra_rdoc_files(manifest) s.files = manifest s.rdoc_options = rdoc_options - s.require_paths = %w(lib ext) s.rubyforge_project = %q{clogger} s.summary = summary s.test_files = %w(test/test_clogger.rb test/test_clogger_to_path.rb) # HeaderHash wasn't case-insensitive in old versions - s.add_dependency(%q, ["> 0.9"]) - s.add_development_dependency(%q, "~> 1.0") + s.add_dependency(%q, ["~> 1.0"]) + s.add_development_dependency(%q, "~> 1.8") s.extensions = %w(ext/clogger_ext/extconf.rb) - # disabled for compatibility with older RubyGems - # s.license = "LGPLv2.1 LGPLv3" + s.licenses = %w(LGPLv2.1+) end -- cgit v1.2.3-24-ge0c7