[前][次][番号順一覧][スレッド一覧]

ruby-changes:47871

From: hsbt <ko1@a...>
Date: Sun, 24 Sep 2017 03:26:27 +0900 (JST)
Subject: [ruby-changes:47871] hsbt:r59992 (trunk): Integrate LICENSE file of rubygems to LEGAL.

hsbt	2017-09-23 11:24:27 +0900 (Sat, 23 Sep 2017)

  New Revision: 59992

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59992

  Log:
    Integrate LICENSE file of rubygems to LEGAL.

  Removed files:
    trunk/lib/rubygems/LICENSE.txt
  Modified files:
    trunk/LEGAL
    trunk/tool/sync_default_gems.rb
Index: lib/rubygems/LICENSE.txt
===================================================================
--- lib/rubygems/LICENSE.txt	(revision 59991)
+++ lib/rubygems/LICENSE.txt	(nonexistent)
@@ -1,54 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/LICENSE.txt#L0
-RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
-Weirich and others.  You can redistribute it and/or modify it under
-either the terms of the MIT license (see the file MIT.txt), 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. 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.
-
-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. The scripts and library files supplied as input to or produced as
-   output from the software do not automatically fall under the
-   copyright of the software, but belong to whomever generated them,
-   and may be sold commercially, and may be aggregated with this
-   software.
-
-6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE.
-

Property changes on: lib/rubygems/LICENSE.txt
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: tool/sync_default_gems.rb
===================================================================
--- tool/sync_default_gems.rb	(revision 59991)
+++ tool/sync_default_gems.rb	(revision 59992)
@@ -64,7 +64,6 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L64
     `cp -r ../../rubygems/rubygems/lib/rubygems* ./lib`
     `cp -r ../../rubygems/rubygems/lib/ubygems.rb ./lib`
     `cp -r ../../rubygems/rubygems/test/rubygems ./test`
-    `cp ../../rubygems/rubygems/LICENSE.txt ./lib/rubygems`
   when "bundler"
     `rm -rf lib/bundler* bin/bundler bin/bundle bin/bundle_ruby spec/bundler`
     `cp -r ../../bundler/bundler/lib/bundler* ./lib`
Index: LEGAL
===================================================================
--- LEGAL	(revision 59991)
+++ LEGAL	(revision 59992)
@@ -682,3 +682,59 @@ spec/ruby: https://github.com/ruby/ruby/blob/trunk/LEGAL#L682
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
+
+lib/rubygems.rb, lib/rubygems/*, test/rubygems:
+
+  RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+  Weirich and others.  You can redistribute it and/or modify it under
+  either the terms of the MIT license (see the file MIT.txt), 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. 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.
+
+  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. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]