From 2cd6800fd8437b1f862f3f5c44db877159271d17 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 15 Sep 2010 15:35:31 +0000 Subject: [PATCH] * COPYING: change Ruby's License from a dual license with GPLv2 to a dual license with 2-clause BSDL. [ruby-dev:42166] [ruby-core:31971] [ruby-dev:39167] [ruby-core:25272] * COPYING.ja: ditto. * BSDL: added. this is from The FreeBSD License. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- COPYING | 4 ++-- COPYING.ja | 6 +++--- ChangeLog | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/COPYING b/COPYING index 9043404a83..a1f19ff99d 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ Ruby is copyrighted free software by Yukihiro Matsumoto . -You can redistribute it and/or modify it under either the terms of the GPL -version 2 (see the file GPL), or the conditions below: +You can redistribute it and/or modify it under either the terms of the +2-clause BSDL (see the file BSDL), 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 diff --git a/COPYING.ja b/COPYING.ja index aa2a163848..5b5b91c149 100644 --- a/COPYING.ja +++ b/COPYING.ja @@ -1,6 +1,6 @@ -本プログラムはフリーソフトウェアです．GPL (the GNU General -Public License)バージョン2または以下に示す条件で本プログラム -を再配布できます．GPLについてはGPLファイルを参照して下さい． +本プログラムはフリーソフトウェアです．2-clause BSDL +または以下に示す条件で本プログラムを再配布できます +2-clause BSDLについてはBSDLファイルを参照して下さい． 1. 複製は制限なく自由です． diff --git a/ChangeLog b/ChangeLog index 8d7b0e1b5d..a14d5c1261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Sep 16 00:26:00 2010 NARUSE, Yui + + * COPYING: change Ruby's License from a dual license with GPLv2 + to a dual license with 2-clause BSDL. + [ruby-dev:42166] [ruby-core:31971] + [ruby-dev:39167] [ruby-core:25272] + + * COPYING.ja: ditto. + + * BSDL: added. this is from The FreeBSD License. + Wed Sep 15 21:07:06 2010 Tanaka Akira * ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated