[med-svn] [gadgetron] 07/08: d/copyright: fix licensing info

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository gadgetron.

commit 201d5fcf2ef3fd5447a1c6b8d542d7144926531c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 27 14:07:24 2015 +0100

    d/copyright: fix licensing info
---
 debian/copyright | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c782344..380266d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,6 @@ Files: *
 Copyright: 2011-2015 Michael S. Hansen <michael.hansen at nih.gov>
            2011-2015 The Gadgetron developers and contributors
 License: MIT
-
-Files: debian/*
-Copyright: 2015 Ghislain Antony Vaillant <ghisvail at gmail.com>
-License: BSD-2-Clause
- On Debian systems, the complete text of the BSD-2-Clause license 
- can be found in "/usr/share/common-licenses/BSD".
-
-License: MIT
  GADGETRON SOFTWARE LICENSE V1.0, NOVEMBER 2011
  PERMISSION IS HEREBY GRANTED, FREE OF CHARGE, TO ANY PERSON OBTAINING
  A COPY OF THIS SOFTWARE AND ASSOCIATED DOCUMENTATION FILES (THE
@@ -42,3 +34,24 @@ License: MIT
  AUTHORS 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.
+
+Files: debian/*
+Copyright: 2015 Ghislain Antony Vaillant <ghisvail at gmail.com>
+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-med/gadgetron.git