[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=2b725cd

The following commit has been merged in the master branch:
commit 2b725cd6ef979383c7b6fcd965081b8b9f1e7b47
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 1 20:17:16 2017 +0200

    Update copyright file
---
 debian/copyright | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9c3b007..a775986 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,38 +11,20 @@ Comment: Numerous people, too many to count, have contributed to akonadi-notes a
 Files: *
 Copyright: 2011, Christian Mollekopf <chrigi_1 at fastmail.fm>
            2012, Christian Mollekopf <mollekopf at kolabsys.com>
+           2012, Rosetta Contributors and Canonical Ltd 2012
+           2011-2014, This_file_is_part_of_KDE
 License: LGPL-2+
 
-Files: COPYING.BSD
-Copyright: No copyright claimed, just the license text
-License: BSD-2-clause
+Files: po/ca/*
+       po/ca at valencia/*
+       po/uk/*
+Copyright: 2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
 
 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
@@ -79,3 +61,12 @@ License: LGPL-2+
  .
  On Debian systems, the complete text of the GNU Library General Public
  License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+
+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-notes packaging