[SCM] parley packaging branch, master, updated. debian/4.14.2-1-26-gcf218ac

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/parley.git;a=commitdiff;h=3573f3d

The following commit has been merged in the master branch:
commit 3573f3d249c861759a3c47d93c1a23653fd17011
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 23 10:07:14 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 63 ++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d52280a..dbdd5a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ parley (4:14.12.2-1~) UNRELEASED; urgency=medium
   * New upstream release (14.12.2).
   * Update build dependencies to build against experimental and to
     follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 09:16:23 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bb869de..cf996be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,27 @@ Upstream-Name: parley
 Source: git://anongit.kde.org/parley
 
 Files: *
-Copyright: 2007-2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net>
-           2008 Avgoustinos Kadis <avgoustinos.kadis at kdemail.net>
-           2008 Daniel Laidig <d.laidig at gmx.de>
-           2004-2007 Peter Hedlund <peter.hedlund at kdemail.net>
-           1999-2001 Ewald Arnold <kvoctrain at ewald-arnold.de>
-           2007 Mauricio Piacentini <mauricio at tabuleiro.com>
-           2007 Matt Williams <matt at milliams.com>
-           2010 Benjamin Schleinzer <ben-kde at schleinzer.eu>
-           2005 Aaron Seigo <aseigo at kde.org>
-           2009 Alexander Rieder <alexanderrieder at gmail.com>
-           2011 Jan Gerrit Marker <jangerrit at weiler-marker.com>
+Copyright: 2009, Alexander Rieder <alexanderrieder at gmail.com>
+           2005, Aaron Seigo <aseigo at kde.org>
+           2008, Andrew Lake <jamboarder at yahoo.com>
+           2014, Andreas Xavier
+           2014, Andreas Xavier <andxav at zoho.com>
+           2008, Avgoustinos Kadis <avgoustinos.kadis at kdemail.net>
+           2010, Benjamin Schleinzer <ben-kde at schleinzer.eu>
+           2008-2010, Daniel Laidig <d.laidig at gmx.de>
+           2009-2010, Daniel Laidig <laidig at kde.org>
+           1999-2001, Ewald Arnold <kvoctrain at ewald-arnold.de>
+           2007-2008, Frederik Gladhorn <frederik.gladhorn at kdemail.net>
+           2007-2010, Frederik Gladhorn <gladhorn at kde.org>
+           1989-1991, Free Software Foundation, Inc
+           2014, Inge Wallin
+           2014, Inge Wallin <inge at lysator.liu.se>
+           2011, Jan Gerrit Marker <jangerrit at weiler-marker.com>
+           2008, Javier Goday <jgoday at gmail.com>
+           2007, Matt Williams <matt at milliams.com>
+           2006-2007, Mauricio Piacentini <mauricio at tabuleiro.com>
+           2004-2007, Peter Hedlund <peter.hedlund at kdemail.net>
+           2009, Thomas Eitzenberger <eth at gmx.at>
 License: GPL-2+
 
 Files: doc/*
@@ -27,13 +37,16 @@ Copyright: 2007 Trolltech ASA
 License: GPL-2
 
 Files: plugins/wiktionary/mwclient/*
-Copyright: 2006-2008 Bryan Tong Minh
-License: Expat
-
-Files: plugins/wiktionary/mwclient/simplejson/*
 Copyright: 2006-2009 Bob Ippolito <bob at redivi.com>
+           2006-2008 Bryan Tong Minh
 License: Expat
 
+Files: src/statistics/statisticslegendwidget.cpp
+       src/statistics/statisticslegendwidget.h
+Copyright: 2014, Andreas Xavier <andxav at zoho.com>
+           2014, Inge Wallin
+License: GPL-3+KDEeV
+
 Files: debian/*
 Copyright: 2011 Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
@@ -101,3 +114,23 @@ License: Expat
  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-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 3 of
+ the License 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 3 can be found in "/usr/share/common-licenses/GPL-3".

-- 
parley packaging