[DRE-commits] [SCM] rubygems.git branch, master, updated. upstream/1.8.10-37-g127a25d

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 127a25db868181576f9d2c3c8bd2c19bdef303f8
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Dec 20 20:42:42 2011 +0100

    update copyright

diff --git a/debian/copyright b/debian/copyright
index 5e70c0e..7f86cc9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,51 +9,51 @@ License: Ruby
  Weirich and others.  You can redistribute it and/or modify it under
  either the terms of the GPL (see the GPL.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).  
- 
+ .
    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

-- 
rubygems.git