[SCM] akonadi-notes packaging branch, master, updated. 4dc0d205d5e0e655ffa7f02cb391f6edc340ecea

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-notes.git;a=commitdiff;h=d6bdee9

The following commit has been merged in the master branch:
commit d6bdee911ed29068a4d4c4a1d915b6949f873e63
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 13 14:42:53 2017 +0100

    lintian happyness
---
 debian/copyright | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e7a14d4..3822f63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -107,15 +107,6 @@ Copyright: 2002, Aaron J. Seigo <aseigo at olympusproject.org>
            2001, Michael H�kel <Michael at Haeckel.Net>
 License: BSD-2-clause
 
-Files: kioslave/src/nntp/CMakeLists.txt
-       kioslave/src/nntp/Mainpage.dox
-       kioslave/src/nntp/Messages.sh
-       kioslave/src/nntp/nntp.protocol
-       kioslave/src/nntp/nntps.protocol
-License: Expat
-Comment: No explicit license found, using license(s) from:
- kioslave/src/nntp/LICENSE
-
 Files: akonadi-contact/src/editor/addresseditor/iconnamecache.cpp
        akonadi-contact/src/editor/addresseditor/iconnamecache_p.h
        akonadi-mime/src/metatype.h
@@ -127,6 +118,22 @@ Files: kioslave/src/ldap/kio_ldap.cpp
        kioslave/src/nntp/LICENSE
 Copyright: 2004-2007, Szombathelyi György <gyurco at freemail.hu>
 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 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: kioslave/src/nntp/nntp.cpp
        kioslave/src/nntp/nntp.h
@@ -196,24 +203,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-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 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, version 2, as

-- 
akonadi-notes packaging