[PATCH] license: upgrade from GPLv2-only to GPLv2-or-later

[PATCH] license: upgrade from GPLv2-only to GPLv2-or-later

[Eric Wong]

The parser has been GPLv2+GPLv3 for a long time (from unicorn).

Note: I currently (strongly) prefer the GPLv3.

In case the GPLv4 arrives and I am not alive to approve/review it,
the lesser of evils is have give blanket approval of all future GPL
versions (as published by the FSF).  The worse evil is to be stuck
with a license which cannot guarantee the Free-ness of this project.

This unfortunately means the FSF can theoretically come out with
license terms I do not agree with, but the GPLv2 and GPLv3 will
always be an option to all users.
---
 LICENSE          | 2 +-
 ext/kcar/kcar.rl | 3 ++-
 kcar.gemspec     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 4fd4dbb..1cfa573 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 kcar 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
-{GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or
+{GPLv2}[http://www.gnu.org/licenses/gpl-2.0.txt] or later or
 the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
diff --git a/ext/kcar/kcar.rl b/ext/kcar/kcar.rl
index e812279..500dc3c 100644
--- a/ext/kcar/kcar.rl
+++ b/ext/kcar/kcar.rl
@@ -1,7 +1,8 @@
 /**
  * Copyright (c) 2009, 2010 Eric Wong (all bugs are Eric's fault)
  * Copyright (c) 2005 Zed A. Shaw
- * You can redistribute it and/or modify it under the same terms as Ruby.
+ * You can redistribute it and/or modify it under the same terms as Ruby 1.8
+ * or the GPLv2 or later.
  */
 #include "ruby.h"
 #include "ext_help.h"
diff --git a/kcar.gemspec b/kcar.gemspec
index 81507dc..a0ca22e 100644
--- a/kcar.gemspec
+++ b/kcar.gemspec
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.extensions = %w(ext/kcar/extconf.rb)
   s.add_development_dependency('wrongdoc', '~> 1.5')
 
-  # s.license = %w(GPL Ruby) # disabled for compatibility with older RubyGems
+  s.license = %w(GPLv2+ Ruby) # disabled for compatibility with older RubyGems
 end
-- 
Eric Wong