[ruby-oci8-commit] [535] trunk/ruby-oci8: Change the license from ruby license to 2-clause BSD license.

nobody at rubyforge.org nobody at rubyforge.org
Tue Oct 2 09:09:26 UTC 2012


Revision: 535
Author:   kubo
Date:     2012-10-02 09:09:26 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Change the license from ruby license to 2-clause BSD license.

Modified Paths:
--------------
    trunk/ruby-oci8/.yardopts
    trunk/ruby-oci8/README.md
    trunk/ruby-oci8/dist-files

Added Paths:
-----------
    trunk/ruby-oci8/COPYING
    trunk/ruby-oci8/COPYING_old

Modified: trunk/ruby-oci8/.yardopts
===================================================================
--- trunk/ruby-oci8/.yardopts	2012-10-02 06:11:04 UTC (rev 534)
+++ trunk/ruby-oci8/.yardopts	2012-10-02 09:09:26 UTC (rev 535)
@@ -4,8 +4,11 @@
 --exclude ext/oci8/oraconf.rb
 --exclude lib/oci8/compat.rb
 --exclude lib/dbd
+--hide-void-return
 -
 NEWS
+COPYING
+COPYING_old
 docs/install-full-client.md
 docs/install-instant-client.md
 docs/install-binary-package.md

Added: trunk/ruby-oci8/COPYING
===================================================================
--- trunk/ruby-oci8/COPYING	                        (rev 0)
+++ trunk/ruby-oci8/COPYING	2012-10-02 09:09:26 UTC (rev 535)
@@ -0,0 +1,30 @@
+# @markup pre
+
+License from ruby-oci8 2.1.3
+
+--- 
+Copyright 2002-2012 Kubo Takehiro <kubo at jiubao.org>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of the authors.


Property changes on: trunk/ruby-oci8/COPYING
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/ruby-oci8/COPYING_old
===================================================================
--- trunk/ruby-oci8/COPYING_old	                        (rev 0)
+++ trunk/ruby-oci8/COPYING_old	2012-10-02 09:09:26 UTC (rev 535)
@@ -0,0 +1,64 @@
+# @markup pre
+
+License until ruby-oci8 2.1.2
+
+The license of ruby-oci8 was changed to 2-clause BSD license by using the following
+2.d clause.
+
+--- 
+Ruby-oci8 is copyrighted free software by Kubo Takehiro <kubo at jiubao.org>.
+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:
+
+  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 binaries 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 binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries 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 binaries 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).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  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: trunk/ruby-oci8/COPYING_old
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/ruby-oci8/README.md
===================================================================
--- trunk/ruby-oci8/README.md	2012-10-02 06:11:04 UTC (rev 534)
+++ trunk/ruby-oci8/README.md	2012-10-02 09:09:26 UTC (rev 535)
@@ -7,8 +7,6 @@
 
 If you need to use Oracle 8, use ruby-oci8 2.0.6.
 
-As for Oracle7, use Oracle7 Module for Ruby by Yoshida Masato.
-
 What's new
 ==========
 
@@ -23,9 +21,10 @@
 
 If you install a ruby-oci8 gem package, you may need to add `-rubygems` before `-r oci8`.
 
-Installation
-============
+Documantation
+=============
 
+* [Reference Manual](http://ruby-oci8.rubyforge.org/en/)
 * {file:docs/install-full-client.md}
 * {file:docs/install-instant-client.md}
 * {file:docs/install-binary-package.md}
@@ -36,3 +35,9 @@
 * {file:docs/report-installation-issue.md}
 * [The issues page on github](https://github.com/kubo/ruby-oci8/issues)
 * [The ruby-oci8 help forum on rubyforge](http://rubyforge.org/forum/forum.php?forum_id=1078)
+
+License
+=======
+
+* {file:COPYING 2-clause BSD-style license} from ruby-oci8 2.1.3
+* {file:COPYING_old old Ruby license} until 2.1.2

Modified: trunk/ruby-oci8/dist-files
===================================================================
--- trunk/ruby-oci8/dist-files	2012-10-02 06:11:04 UTC (rev 534)
+++ trunk/ruby-oci8/dist-files	2012-10-02 09:09:26 UTC (rev 535)
@@ -1,4 +1,6 @@
 .yardopts
+COPYING
+COPYING_old
 ChangeLog
 Makefile
 NEWS



More information about the ruby-oci8-commit mailing list