[DRE-commits] [SCM] ruby-bio.git branch, master, updated. upstream/1.4.1-9-g2e56981

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 59c50eb91c8beead4352400f554a92c1187d86e6
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Sep 25 10:51:57 2011 +0200

    fix typo in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 9ad752d..ff3c09d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,65 +8,71 @@ Copyright: Copyright Toshiaki Katayama <k at bioruby.org>
 License: GPL-2 or Ruby
  BioRuby is copyrighted free software by Toshiaki Katayama <k at bioruby.org>.
  You can redistribute it and/or modify it under either the terms of the GPL
+ version 2 (see the file GPL), or the conditions below.
+
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Ruby
+ BioRuby is copyrighted free software by Toshiaki Katayama <k at bioruby.org>.
+ You can redistribute it and/or modify it under either the terms of the GPL
  version 2 (see the file GPL), 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) give non-standard binaries non-standard names, with
            instructions on where to get the original software distribution.
- 
+ .
         d) make other distribution arrangements with the author.
- 
+ .
    3. You may distribute the software in object code or binary form,
       provided that you do at least ONE of the following:
- 
+ .
         a) distribute the binaries 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 binaries 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 these terms.
- 
+ .
       For the list of those files and their copying conditions, see the
       file LEGAL.
- 
+ .
    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.
 
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
 Files: debian/*
 Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
-License: same as upstream
+License: GPL-2 or Ruby

-- 
ruby-bio.git