[med-svn] [scythe] 03/03: Fix linitan warning about duplicate licenses

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository scythe.

commit 3a481bf709ae8be2609c353925403aa663830db4
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Wed Sep 23 22:52:11 2015 +1000

    Fix linitan warning about duplicate licenses
---
 debian/copyright | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d2c1c35..24d5520 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,29 +6,19 @@ Source: https://github.com/vsbuffalo/scythe
 Files: *
 Copyright: 2011 Vince Buffalo
 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.
 
 Files: src/kseq.h
 Copyright: 2008, 2009, 2011 Attractive Chaos <attractor at live.co.uk>
 License: Expat
+
+Files: debian/*
+Copyright: 2015 Kevin Murray
+License: GPL-3+
+
+License: GPL-3+
+ See `/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
@@ -48,10 +38,3 @@ License: Expat
  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 Kevin Murray
-License: GPL-3+
-
-License: GPL-3+
- See `/usr/share/common-licenses/GPL-3'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/scythe.git