[DRE-commits] [SCM] ruby-extlib.git branch, master, updated. debian/0.9.15-1-1-g6244c7d

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit 6244c7d89620d80ee78e2032587e7e26aae99874
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Wed May 2 17:22:20 2012 +0200

    Add full text of the Ruby licence.

diff --git a/debian/changelog b/debian/changelog
index 22f295b..4f6115a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-extlib (0.9.15-2) unstable; urgency=low
+
+  * Add full text of the Ruby licence.
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Wed, 02 May 2012 17:22:04 +0200
+
 ruby-extlib (0.9.15-1) unstable; urgency=low
 
   * Update to new Ruby policy
diff --git a/debian/copyright b/debian/copyright
index a9fe81a..082ff1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,5 +48,66 @@ License for lib/extlib/dictionary.rb:
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
     FOR A PARTICULAR PURPOSE.
 
-The Debian packaging is © 2009, Bryan McLellan <btm at loftninjas.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The full text of the Ruby licence is:
+
+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 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], fnmatch.[ch],
+     glob.c, 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+Debian packaging:
+
+   The Debian packaging is © 2009, Bryan McLellan <btm at loftninjas.org>
+   and is licensed under the GPL, see /usr/share/common-licenses/GPL.

-- 
ruby-extlib.git