[SCM] kcodecs packaging branch, master, updated. debian/5.37.0-2-93-gd165600

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcodecs.git;a=commitdiff;h=95177fc

The following commit has been merged in the master branch:
commit 95177fcbadd185e9866941c1758651bf9bef4c13
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 10 09:00:10 2015 +0200

    fix license fields for lintian
    
    lintian disapproves of using either-or with a license block. rightfully so
    even.
---
 debian/copyright | 68 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 152acf1..3298651 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,6 +74,41 @@ Files: src/probers/nsSJISProber.h
        src/probers/nsSBCSGroupProber.h
 Copyright: 2001, Netscape Communications Corporation
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+
+Files: po/bg/kcodecs5_qt.po
+Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
+           2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+ This file is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: 2014, Rohan Garg <rohangarg at kubuntu.org>
+License: LGPL-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.
+
+License: MPL-1.1
  ***** BEGIN LICENSE BLOCK *****
  Version: MPL 1.1/GPL 2.0/LGPL 2.1
  .
@@ -111,39 +146,6 @@ License: MPL-1.1 or GPL-2+ or LGPL-2.1+
  .
  ***** END LICENSE BLOCK *****
 
-Files: po/bg/kcodecs5_qt.po
-Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
-           2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
-License: GPL
- This file is licensed under the GPL.
- .
- On Debian systems, the complete text of the GNU General Public License can be
- found in `/usr/share/common-licenses/GPL'.
-
-Files: debian/*
-Copyright: 2014, Rohan Garg <rohangarg at kubuntu.org>
-License: LGPL-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.
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as

-- 
kcodecs packaging