[DRE-commits] [SCM] ruby-mocha.git branch, master, updated. debian/0.11.3-2-20-g57274dd

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b4499bca47eb74f547ff9f92415d4c1bc96a1d0a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Apr 13 15:27:48 2013 +0200

    update Ruby license, rename MIT to Expat

diff --git a/debian/copyright b/debian/copyright
index 1ca9825..72ca9cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,22 +4,14 @@ Source: https://github.com/floehopper/mocha
 
 Files: *
 Copyright: Copyright Revieworld Ltd. 2006
-License: MIT or Ruby
+License: Expat or Ruby
 
 Files: debian/*
 Copyright: Copyright 2011 Antonio Terceiro <terceiro at softwarelivre.org>
            Copyright 2012-2013 Cédric Boutillier <boutil at debian.org>
-License: MIT or Ruby
+License: Expat or Ruby
 
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation version 2.
- .
- On Debian systems the full text of the GNU General Public License version 2 can
- be found in `/usr/share/common-licenses/GPL-2'.
-
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -40,46 +32,58 @@ License: MIT
 
 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
- version 2 (see the file GPL), or the conditions below:
+ You can redistribute it and/or modify it under either the terms of the
+ 2-clause BSDL (see the file BSDL), 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.
+ 	  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.
+ 	  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.
+ 	  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.
-

-- 
ruby-mocha.git