[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/0.9.0+dfsg-1-40-g5f13e1e

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 5f13e1eb12575a342b35cf83f2eab4b9f74f1220
Merge: 6116cc2446f5ba7b9855539ba7480b09df17e8e5 caf1198f2127117e5b648d8e24b34754c0603c84
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Aug 8 22:10:25 2009 +0200

    Merge branch 'ironpython'

diff --combined debian/copyright
index 72570dd,a329566..a8f9d30
--- a/debian/copyright
+++ b/debian/copyright
@@@ -186,81 -186,11 +186,82 @@@ THE PROGRAM CONSTITUTES RECIPIENT'S ACC
  
        This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
  
 +-------------------------------------------------------------------------------
 +
 +debian/scripts/ruby/igem
 +debian/scripts/ruby/irake
 +debian/scripts/ruby/irails
 +debian/scripts/ruby/iri
 +debian/scripts/ruby/iirb
 +debian/scripts/ruby/irack
 +debian/scripts/ruby/irdoc
 +debian/scripts/ruby/ir
 +
 +Copyright (c) 2003 Dave Thomas
 +Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich, and others.
 +
 +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 COPYING.txt 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.
  
 -Merlin/External.LCA_RESTRICTED/Languages/IronRuby/Yaml/IronRuby.Libraries.Yaml/Engine/* - CPL
 +  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.
 +
 +-------------------------------------------------------------------------------
  
  The Debian packaging is
+ (C) 2004, Matthias Klose <doko at debian.org>
  (C) 2009, C.J. Adams-Collier <cjac at colliertech.org>
  (C) 2009, Mirco Bauer <meebey at debian.org>
  and is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.

-- 
ironruby