[SCM] akonadi-mime packaging branch, master, updated. 064c4163e44c59ecb452f81b88032eb8a4bd228c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 88935271373f91a35a6d7c4ec0484964f1b4261d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Aug 31 14:52:38 2017 +0200

    Update copyright file
---
 debian/copyright | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c8e7da4..f0d1d76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,8 +18,11 @@ Copyright: 2010, Andras Mantia <andras at kdab.com>
            2010, Klaralvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
            2010, Leo Franchi <lfranchi at kde.org>
            2007, Robert Zwerus <arzie at dds.nl>
+           2007, Till Adam <adam at kde.org>
            2009-2010, Tobias Koenig <tokoe at kde.org>
            2006-2007, Volker Krause <vkrause at kde.org>
+           2011, Rosetta Contributors and Canonical Ltd 2011
+           2010-2016, This_file_is_part_of_KDE
 License: LGPL-2+
 
 Files: COPYING.LIB
@@ -43,40 +46,20 @@ Copyright: 2010, Andras Mantia <andras at kdab.com>
            2010, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
 License: LGPL-2.1+
 
+Files: po/ca/*
+       po/ca at valencia/*
+       po/uk/*
+Copyright: 2014-2016, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
 Files: src/metatype.h
 Copyright: 2009, Thomas McGuire <mcguire at kde.org>
 License: LGPL-2+3+KDEeV
 
-Files: COPYING.BSD
-Copyright: Only the license text is present
-License: BSD-2-clause
-
 Files: debian/*
 Copyright: 2007-2015, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (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: 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 published by
@@ -154,3 +137,12 @@ License: LGPL-2+3+KDEeV
  License version 2 can be found in `/usr/share/common-licenses/LGPL-2',
  likewise, the complete text of the GNU Lesser General Public License version
  3 can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ .
+ The complete text of the GNU Lesser General Public License version 2.1 can be
+ found in `/usr/share/common-licenses/LGPL-2.1', likewise, the complete text
+ of the GNU Lesser General Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3'.

-- 
akonadi-mime packaging