From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS14383 205.234.109.0/24 X-Spam-Status: No, score=-0.5 required=5.0 tests=AWL,MSGID_FROM_MTA_HEADER, RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable version=3.3.2 Path: news.gmane.org!not-for-mail From: Eric Wong Newsgroups: gmane.comp.lang.ruby.unicorn.general Subject: [RFC/PATCH] LICENSE: add GPLv3 to license terms Date: Wed, 27 Apr 2011 17:59:03 -0700 Message-ID: <20110428005903.GA22995@dcvr.yhbt.net> References: <20110428005727.GA19557@dcvr.yhbt.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1303952487 12975 80.91.229.12 (28 Apr 2011 01:01:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 28 Apr 2011 01:01:27 +0000 (UTC) Cc: mongrel-unicorn@rubyforge.org To: "Zed A. Shaw" , Evan Weaver Original-X-From: mongrel-unicorn-bounces@rubyforge.org Thu Apr 28 03:01:22 2011 Return-path: Envelope-to: gclrug-mongrel-unicorn@m.gmane.org X-Original-To: mongrel-unicorn@rubyforge.org Delivered-To: mongrel-unicorn@rubyforge.org Content-Disposition: inline In-Reply-To: <20110428005727.GA19557@dcvr.yhbt.net> User-Agent: Mutt/1.5.18 (2008-05-17) X-BeenThere: mongrel-unicorn@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: mongrel-unicorn-bounces@rubyforge.org Errors-To: mongrel-unicorn-bounces@rubyforge.org Xref: news.gmane.org gmane.comp.lang.ruby.unicorn.general:932 Archived-At: Received: from rubyforge.org ([205.234.109.19]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QFFbd-00077I-UI for gclrug-mongrel-unicorn@m.gmane.org; Thu, 28 Apr 2011 03:01:22 +0200 Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 865873C8039; Wed, 27 Apr 2011 21:01:18 -0400 (EDT) Received: from dcvr.yhbt.net (dcvr.yhbt.net [64.71.152.64]) by rubyforge.org (Postfix) with ESMTP id 21DC118583AB for ; Wed, 27 Apr 2011 20:59:10 -0400 (EDT) Received: from localhost (unknown [127.0.2.5]) by dcvr.yhbt.net (Postfix) with ESMTP id BE21C1FD59; Thu, 28 Apr 2011 00:59:08 +0000 (UTC) Here's a proposed patch for the exact wording: diff --git a/LICENSE b/LICENSE index d48c2d4..386aa40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,17 @@ Unicorn 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 -the conditions below: +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). + +The unicorn 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. + +=== Ruby-specific terms (if you're not using the GPLv2/GPLv3) 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 -- Eric Wong _______________________________________________ Unicorn mailing list - mongrel-unicorn@rubyforge.org http://rubyforge.org/mailman/listinfo/mongrel-unicorn Do not quote signatures (like this one) or top post when replying