[SCM] kpeople packaging branch, master, updated. 7737b678fee807bacfdfea3ca709a92bdea1cb04

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kpeople.git;a=commitdiff;h=31faf46

The following commit has been merged in the master branch:
commit 31faf4644e46fd82d8555ad2cb7f026f620788a7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Mar 14 11:45:24 2015 +0100

    Update copyright information
---
 debian/copyright | 86 +++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3af6c2a..cb9103f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,20 +3,57 @@ Upstream-Name: kpeople
 Source: https://projects.kde.org/projects/frameworks/kpeople
 
 Files: *
-Copyright: 2012-2014 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-           2011-2013 Martin Klapetek <mklapetek at kde.org>
-           2013 David Edmundson <davidedmundson at kde.org>
-           2013 Franck Arrecot <franck.arrecot at gmail.com>
+Copyright: 2012-2015, Aleix Pol i Gonzalez <aleixpol at blue-systems.com>
+           2013, David Edmundson <D.Edmundson at lboro.ac.uk>
+           2013, David Edmundson <david at davidedmundson.co.uk>
+           2013, David Edmundson <davidedmundson at kde.org>
+           2013, David Edmundson <davidedmundsonk at kde.org>
+           2013, Franck Arrecot <franck.arrecot at gmail.com>
+           1991-1999, Free Software Foundation, Inc
+           2012, Martin Klapetek <martin.klapetek at gmail.com>
+           2011-2013, Martin Klapetek <mklapetek at kde.org>
+           2013, Rosetta Contributors and Canonical Ltd 2013
+           2014, This_file_is_part_of_KDE
 License: LGPL-2.1+
 
-Files: src/backends/allcontactsmonitor.*
-Copyright: 2013 David Edmundson <d.edmundson at lboro.ac.uk>
-License: GPL-KDEeV
+Files: Mainpage.dox
+       po/ca/libkpeople.po
+       po/uk/libkpeople.po
+Copyright: 2013, David Edmundson <davidedmundson at kde.org>
+           2015, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
+Files: src/backends/allcontactsmonitor.cpp
+       src/backends/allcontactsmonitor.h
+Copyright: 2013, David Edmundson <d.edmundson at lboro.ac.uk>
+License: GPL-2+3+KDEeV
 
 Files: debian/*
 Copyright: 2015 Harald Sitter <sitter at kde.org>
 License: LGPL-2.1+
 
+License: GPL-2+3+KDEeV
+ 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 the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise,
+ the complete text of the GNU General Public License version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
+
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -31,22 +68,27 @@ License: LGPL-2.1+
  You should have received a copy of the GNU Lesser General Public
  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General Lesser
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-License: GPL-KDEeV
- 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 the Free Software Foundation; either version 2 of
- the License or (at your option) version 3 or any later version
- accepted by the membership of KDE e.V. (or its successor approved
- by the membership of KDE e.V.), which shall act as a proxy
- defined in Section 14 of version 3 of the license.
+License: LGPL-2.1+3+KDEeV
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
  .
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in "/usr/share/common-licenses/GPL".
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, 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'.

-- 
kpeople packaging