[med-svn] [python-cutadapt] 01/02: cme fix dpkg-copyright

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-cutadapt.

commit af2df81347385edab4a2a53db28b291ae43187c2
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 21 15:33:50 2016 +0200

    cme fix dpkg-copyright
---
 debian/changelog |  2 +-
 debian/copyright | 44 +++++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 859dc39..7b93065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ python-cutadapt (1.10-2) UNRELEASED; urgency=medium
   * Add missing Breaks for new package cutadapt
   * Clarified license
 
- -- Andreas Tille <tille at debian.org>  Tue, 21 Jun 2016 13:20:58 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 21 Jun 2016 15:33:45 +0200
 
 python-cutadapt (1.10-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 11566e5..68fb111 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,7 @@ Source: http://pypi.python.org/pypi/cutadapt
 
 Files: *
 Copyright: 2010-2015 Marcel Martin <marcel.martin at scilifelab.se>
-License: MIT
-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
@@ -26,29 +25,9 @@ License: MIT
 
 Files: bin/_preamble.py
 Copyright: 2010-2015 Twisted Matrix Laboratories.
-License: MIT
+License: Expat
 Comment: Copied from Twisted (http://twistedmatrix.com/)
 
-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.
-
-
 Files: debian/*
 Copyright: 2015 Olivier Sallou <osallou at debian.org>
 License: GPL-2+
@@ -67,3 +46,22 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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/python-cutadapt.git