[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/20090805+git.e6b28d27+dfsg-1-2-g46fa204

[C.J. Adams-Collier]

The following commit has been merged in the master branch:
commit 46fa20431a01c864e53c65bb12c5a4702ad07e8d
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Wed Sep 23 11:11:45 2009 -0700

    noted filename in copyright, removed LICENSE.txt and the reference in ironruby.install

diff --git a/debian/LICENSE.txt b/debian/LICENSE.txt
deleted file mode 100644
index 4a99f6f..0000000
--- a/debian/LICENSE.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-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.
-
-  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.
-
diff --git a/debian/copyright b/debian/copyright
index 1826b39..8ecf23d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -197,9 +197,13 @@ Merlin/Main/Languages/Ruby/Scripts/bin/irake
 Merlin/Main/Languages/Ruby/Scripts/bin/irdoc
 Merlin/Main/Languages/Ruby/Scripts/bin/iri
 
+Ruby License (referred to as LICENSE.txt)
+
 Copyright (c) 2003 Dave Thomas
 Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich, and others.
 
+http://www.ruby-lang.org/en/LICENSE.txt
+
 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:
diff --git a/debian/ironruby.install b/debian/ironruby.install
index fcf9b8a..9f4f562 100644
--- a/debian/ironruby.install
+++ b/debian/ironruby.install
@@ -4,7 +4,6 @@ Merlin/Main/Languages/Ruby/Libs /usr/lib/ironruby
 Merlin/Main/Bin/Debug/ir.exe* /usr/lib/ironruby
 debian/ir /usr/bin
 debian/ir.exe.config /usr/lib/ironruby
-debian/LICENSE.txt /usr/share/doc/ironruby
 Merlin/Main/Languages/Ruby/Scripts/bin/igem /usr/bin
 Merlin/Main/Languages/Ruby/Scripts/bin/iirb /usr/bin
 Merlin/Main/Languages/Ruby/Scripts/bin/irackup /usr/bin

-- 
ironruby