[numexpr] 03/03: Disambiguate MIT license type

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository numexpr.

commit 9452aba96e2761d49506b2bc664c171844173d24
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 6 09:03:15 2016 +0000

    Disambiguate MIT license type
---
 debian/changelog |  1 +
 debian/copyright | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0dfe64..ebe2eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ numexpr (2.4.6-1) UNRELEASED; urgency=medium
   * New upstream release
   * Standard version bumped to 3.9.7
   * Fix Vcs-Git URL
+  * Updated debian/copyright: disambiguate MIT license type
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Fri, 05 Feb 2016 09:19:05 +0000
 
diff --git a/debian/copyright b/debian/copyright
index a1f3e28..eb9f6e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,30 +13,11 @@ Copyright: 2007-2008 David M. Cooke <david.m.cooke at gmail.com>
                      Mark Wiebe
                      Gaëtan de Menten
                      Antonio Valentino <antonio.valentino at tiscali.it>
-License: MIT
-
-License: MIT
- 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 to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+License: Expat
 
 Files: numexpr/win32/pthread.*
 Copyright: 2009 Andrzej K. Haczewski <ahaczewski at gmail.com>
-License: MIT
+License: Expat
 
 Files: numexpr/cpuinfo.py
 Copyright: 2002  Pearu Peterson <pearu at cens.ioc.ee>
@@ -73,6 +54,7 @@ License: other
 
 Files: debian/*
 Copyright: 2010 Wen Heping <wenheping at gmail.com>
+           2012- Antonio Valentino <antonio.valentino at tiscali.it>
 License: GPL-3.0
  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
@@ -90,3 +72,21 @@ License: GPL-3.0
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
+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 to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/numexpr.git