[DRE-commits] [SCM] ruby-json.git branch, master, updated. upstream/1.6.3-38-ga4eff61

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit a7feea59a285ef94d473e263b9542b269bcdc7bf
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon May 21 13:23:23 2012 +0200

    update debian/copyright to mention the Ruby license and java/* files

diff --git a/debian/copyright b/debian/copyright
index 7ce0af0..a6cb917 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,11 @@ Source: https://rubygems.org/gems/json
 
 Files: *
 Copyright: Copyright 2005-2007 by Florian Frank <flori at ping.de>
-License: GPL-2
+License: Ruby or GPL-2
+
+Files: java/*
+Copyright: Copyright Daniel Luz <mernen at gmail.com>
+License: Ruby or GPL-2
 
 Files: debian/*
 Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
@@ -28,3 +32,62 @@ License: GPL-2
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see GPL 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).  But some files in the distribution
+      are not written by the author, so that they are not under this terms.
+ .
+      They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+      files under the ./missing directory.  See each file for the copying
+      condition.
+ .
+   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.
+

-- 
ruby-json.git