[sunflow] 03/04: collapse multiple Expat licenses into 1

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository sunflow.

commit 12e9662674aff50f6ea119dd05248673883bedd1
Author: tony mancill <tmancill at debian.org>
Date:   Thu Feb 19 23:13:40 2015 -0800

    collapse multiple Expat licenses into 1
---
 debian/changelog |  1 +
 debian/copyright | 44 +++++++-------------------------------------
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bd552e..80ef11a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sunflow (0.07.2.svn396+dfsg-14) UNRELEASED; urgency=medium
   * Patch debian/rules to make the build reproducible.  (Closes: #778702)
     - Thanks to Reiner Herrmann for the bug report and patch.
   * Bump Standards-Version to 3.9.6 (no changes).
+  * Clean up debian/copyright.
 
  -- tony mancill <tmancill at debian.org>  Thu, 19 Feb 2015 22:55:59 -0800
 
diff --git a/debian/copyright b/debian/copyright
index e7ae2c7..7a1a8fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,24 +5,7 @@ Source: http://sunflow.sourceforge.net/
 
 Files: *
 Copyright: 2003-2008, Christopher Kulla <ckulla at gmail.com>
-License: MIT license
- 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: exporters/blender/sunflow_export.py
 Copyright: Robert "hayfever" Lindsay, Miguel "MADCello" Dominguez,
@@ -43,28 +26,13 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2007-2008, Cyril Brulebois <kibi at debian.org>
                 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
-License: MIT license
- 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: debian/sunflow.svg
 Copyright: 2008, Philipp Hagemeister <phihag at phihag.de>
-License: MIT license
+License: Expat
+
+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
@@ -72,8 +40,10 @@ License: MIT license
  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

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/sunflow.git