[DRE-commits] [SCM] ruby-creole.git branch, master, updated. upstream/0.5.0-18-g99534fb

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit be98ff7ba709d5663660041d600004e4a88bc716
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Mar 16 08:42:48 2013 +0000

    Properly include Ruby license in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 28147ae..de9981d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,10 +5,6 @@ Source: https://github.com/minad/creole
 Files: *
 Copyright: Copyright (c) 2008 Lars Christensen
 License: Ruby
- Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
- You can redistribute it and/or modify it under either the terms of the GPL
- (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.
@@ -20,7 +16,7 @@ License: Ruby
            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.
  .
@@ -51,9 +47,9 @@ License: Ruby
       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 
+   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, 
+      copyright of the software, but belong to whomever generated them,
       and may be sold commercially, and may be aggregated with this
       software.
  .

-- 
ruby-creole.git