ruby-changes:38493
From: usa <ko1@a...>
Date: Thu, 21 May 2015 13:21:11 +0900 (JST)
Subject: [ruby-changes:38493] usa:r50574 (ruby_2_1): merge revision(s) 50185: [Backport #10952]
usa 2015-05-21 13:20:38 +0900 (Thu, 21 May 2015) New Revision: 50574 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50574 Log: merge revision(s) 50185: [Backport #10952] * bigdecimal: conform to ruby's license. [ruby-core:68466] [Bug #10952] Removed files: branches/ruby_2_1/ext/bigdecimal/README Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/ext/bigdecimal/bigdecimal.c branches/ruby_2_1/ext/bigdecimal/bigdecimal.gemspec branches/ruby_2_1/ext/bigdecimal/bigdecimal.h branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 50573) +++ ruby_2_1/ChangeLog (revision 50574) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Thu May 21 13:19:52 2015 Kenta Murata <mrkn@c...> + + * bigdecimal: conform to ruby's license. [ruby-core:68466] [Bug #10952] + Thu May 21 09:49:01 2015 Nobuyoshi Nakada <nobu@r...> * gc.c (id2ref): prohibit from accessing internal objects. Index: ruby_2_1/ext/bigdecimal/README =================================================================== --- ruby_2_1/ext/bigdecimal/README (revision 50573) +++ ruby_2_1/ext/bigdecimal/README (revision 50574) @@ -1,60 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/README#L0 - - Ruby BIGDECIMAL(Variable Precision) extension library. - Copyright (C) 1999 by Shigeo Kobayashi(shigeo@t...) - -BigDecimal is copyrighted free software by Shigeo Kobayashi <shigeo@t...>. -You can redistribute it and/or modify it under either the terms of the GPL -(see COPYING file), 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 - original copyright notices and associated disclaimers. - - 2. You may modify your copy of the software in any way, provided that - you do at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise - make them Freely Available, such as by posting said - modifications to Usenet or an equivalent medium, or by allowing - the author to include your modifications in the software. - - b) use the modified software only within your corporation or - organization. - - c) rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided. - - d) make other distribution arrangements with the author. - - 3. You may distribute the software in object code or executable - form, provided that you do at least ONE of the following: - - a) distribute the executables and library files of the software, - together with instructions (in the manual page or equivalent) - on where to get the original distribution. - - b) accompany the distribution with the machine-readable source of - the software. - - c) give non-standard executables non-standard names, with - instructions on where to get the original software distribution. - - d) make other distribution arrangements with the author. - - 4. You may modify and include the part of the software into any other - software (possibly commercial). - - 5. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - PURPOSE. - -* The Author - -Feel free to send comments and bug reports to the ruby-core team. - - http://bugs.ruby-lang.org - -------------------------------------------------------- -created at: Thu Dec 22 1999 -updated at: Wed Sep 28 2011 Index: ruby_2_1/ext/bigdecimal/bigdecimal.c =================================================================== --- ruby_2_1/ext/bigdecimal/bigdecimal.c (revision 50573) +++ ruby_2_1/ext/bigdecimal/bigdecimal.c (revision 50574) @@ -4,13 +4,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.c#L4 * * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@t...) * - * You may distribute under the terms of either the GNU General Public - * License or the Artistic License, as specified in the README file - * of this BigDecimal distribution. - * - * NOTE: Change log in this source removed to reduce source code size. - * See rev. 1.25 if needed. - * */ /* #define BIGDECIMAL_DEBUG 1 */ Index: ruby_2_1/ext/bigdecimal/bigdecimal.gemspec =================================================================== --- ruby_2_1/ext/bigdecimal/bigdecimal.gemspec (revision 50573) +++ ruby_2_1/ext/bigdecimal/bigdecimal.gemspec (revision 50574) @@ -6,6 +6,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.gemspec#L6 s.name = "bigdecimal" s.version = _VERSION s.date = date + s.license = 'ruby' s.summary = "Arbitrary-precision decimal floating-point number library." s.homepage = "http://www.ruby-lang.org" s.email = "mrkn@m..." @@ -16,7 +17,6 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.gemspec#L17 bigdecimal.gemspec bigdecimal.c bigdecimal.h - README depend extconf.rb lib/bigdecimal/jacobian.rb lib/bigdecimal/ludcmp.rb Index: ruby_2_1/ext/bigdecimal/bigdecimal.h =================================================================== --- ruby_2_1/ext/bigdecimal/bigdecimal.h (revision 50573) +++ ruby_2_1/ext/bigdecimal/bigdecimal.h (revision 50574) @@ -4,13 +4,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.h#L4 * * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@t...) * - * You may distribute under the terms of either the GNU General Public - * License or the Artistic License, as specified in the README file - * of this BigDecimal distribution. - * - * NOTES: - * 2003-03-28 V1.0 checked in. - * */ #ifndef RUBY_BIG_DECIMAL_H Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 50573) +++ ruby_2_1/version.h (revision 50574) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-05-21" -#define RUBY_PATCHLEVEL 347 +#define RUBY_PATCHLEVEL 348 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r50185 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/