[SCM] frameworkintegration packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g5c43253

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit a5f385e44956d820e408345520d27d149134d3b7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 6 12:36:18 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 97 ++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e700d20..9a5747d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ frameworkintegration (5.6.0-1~) UNRELEASED; urgency=medium
 
   * Prepare initial Debian release.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Feb 2015 11:50:00 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f4040a1..74367bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,24 +3,15 @@ Upstream-Name: frameworkintegration
 Source: https://projects.kde.org/projects/frameworks/frameworkintegration
 
 Files: *
-       debian/*
-Copyright: © 2013 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-           © 2013 Alejandro Fiestas Olivares <afiestas at kde.org>
-           © 2013 Kevin Ottens <ervin+bluesystems at kde.org>
-           © 2003, 2005-2006 Sandro Giessl <giessl at kde.org> <sandro at giessl.com>
-           © 2002-2005 Maksim Orlovich <maksim at kde.org>
-           © 2001-2002 Karol Szwed <gallium at kde.org>
-           © 2000, 2006, 2012 David Faure <faure+bluesystems at kde.org> <faure at kde.org>
-           © 1998-2000 TrollTech AS
-           © 1998-2000 Keramik for KDE3,
-           © 2001-2002 Fredrik Höglund <fredrik at kde.org>
-           © 2000 Dirk Mueller <mueller at kde.org>
-           © 2000 Daniel M. Duley <mosfet at kde.org>
-           © 2001 Martijn Klingens <klingens at kde.org>
-           © 2008 Friedrich W. H. Kossebau <kossebau at kde.org>
-           © 2002 Malte Starostik <malte at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2+
+Copyright: 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+           2013, Alejandro Fiestas Olivares <afiestas at kde.org>
+           2012, David Faure <faure+bluesystems at kde.org>
+           2014, Dominik Haumann <dhaumann at kde.org>
+           2013, Kevin Ottens <ervin+bluesystems at kde.org>
+           2014, Lukáš Tinkl <ltinkl at redhat.com>
+           2014, Martin Gräßlin <mgraesslin at kde.org>
+           2014, Martin Klapetek <mklapetek at kde.org>
+License: LGPL-2+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 of the License or ( at
@@ -32,20 +23,41 @@ License: LGPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- 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
-Comment: or ( at your option ) version 3 or, at the discretion of KDE e.V.
+ 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",
+ likewise, the complete text of the GNU Lesser General Public License version
+ 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
+Files: src/kstyle/kstyle.cpp
+       src/kstyle/kstyle.h
+       src/platformtheme/kfiletreeview.cpp
+       src/platformtheme/kfiletreeview_p.h
+       tests/kstyletest.cpp
+Copyright: 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+           2013, Alejandro Fiestas Olivares <afiestas at kde.org>
+           2000, Daniel M. Duley <mosfet at kde.org>
+           2000, Dirk Mueller <mueller at kde.org>
+           2001-2002, Fredrik Höglund <fredrik at kde.org>
+           2001-2002, Karol Szwed <gallium at kde.org>
+           2002-2005, Maksim Orlovich <maksim at kde.org>
+           2002, Malte Starostik <malte at kde.org>
+           2001, Martijn Klingens <klingens at kde.org>
+           2005-2006, Sandro Giessl <giessl at kde.org>
+           2003, Sandro Giessl <sandro at giessl.com>
+           2007, Tobias Koenig <tokoe at kde.org>
+           1998-2000, TrollTech AS
+License: LGPL-2+
 
-Files: src/platformtheme/kdirselectdialog_p.h
- src/platformtheme/kdirselectdialog.cpp
- src/platformtheme/kfontsettingsdata.cpp
- src/platformtheme/kfontsettingsdata.h
- src/kstyle/kstyle.cpp
- tests/kstyletest.cpp
-Copyright: 2000, 2006 David Faure <faure at kde.org>
-           2008 Friedrich W. H. Kossebau <kossebau at kde.org>
-           2013 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+Files: src/platformtheme/kdirselectdialog.cpp
+       src/platformtheme/kdirselectdialog_p.h
+       src/platformtheme/kfontsettingsdata.cpp
+       src/platformtheme/kfontsettingsdata.h
+Copyright: 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+           2001-2002, Carsten Pfeiffer <pfeiffer at kde.org>
+           2000-2006, David Faure <faure at kde.org>
+           2008, Friedrich W. H. Kossebau <kossebau at kde.org>
+           2001, Michael Jarrett <michaelj at corel.com>
+           2009, Shaun Reich <shaun.reich at kdemail.net>
 License: LGPL-2
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -56,6 +68,23 @@ License: LGPL-2
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- 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
+ 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".
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ 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
+ Library General Public License for more details.
+ .
+ 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".

-- 
frameworkintegration packaging