[SCM] kguiaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g99f15e0
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 12:58:20 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kguiaddons.git;a=commitdiff;h=2623a07
The following commit has been merged in the kubuntu_wily_archive branch:
commit 2623a074d6f3bca4dbad75e0c3ce37f8199c7125
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Jan 23 11:34:36 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 129 +++++++++++++++++++++++++++++++------------------------
2 files changed, 74 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dbf70c2..7101de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kguiaddons (5.6.0-1~) UNRELEASED; urgency=medium
* Bump build dependencies to build against the experimental versions.
* Bump Standards-Version to 3.9.6, no changes needed.
* Update install files.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Fri, 23 Jan 2015 10:43:31 +0100
diff --git a/debian/copyright b/debian/copyright
index 9822533..05fb04f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,13 @@ Upstream-Name: kguiaddons
Source: https://projects.kde.org/projects/frameworks/kguiaddons
Files: *
-Copyright: 2009 Michael Leupold <lemma at confuego.org>
- 2013 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
- 2013 Martin Gräßlin <mgraesslin at kde.org>
- 1999 Waldo Bastian (bastian at kde.org)
- 2005, 2009 by Albert Astals Cid <aacid at kde.org>
- 2013 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
- 2013 Martin Klapetek <mklapetek at kde.org>
-License: LGPL-2.1+ approved by KDE e.V.
+Copyright: 2005-2014, Albert Astals Cid <aacid at kde.org>
+ 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+ 2013, Martin Gräßlin <mgraesslin at kde.org>
+ 2013, Martin Klapetek <mklapetek at kde.org>
+ 2009, Michael Leupold <lemma at confuego.org>
+ 1999, Waldo Bastian <bastian at kde.org>
+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
@@ -27,32 +26,48 @@ License: LGPL-2.1+ approved by KDE e.V.
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".
+ 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 version 3 of the GNU Lesser General Public License can be found in
+ "/usr/share/common-licenses/LGPL-3".
Files: autotests/kwordwraptest.cpp
+ src/colors/kcolormimedata.cpp
+ src/colors/kcolormimedata.h
src/colors/kcolorspaces.cpp
- src/colors/kcolorutils.h
+ src/colors/kcolorspaces_p.h
src/colors/kcolorutils.cpp
+ src/colors/kcolorutils.h
src/colors/kguiaddons_colorhelpers_p.h
- src/colors/kcolormimedata.h
- src/colors/kcolorspaces_p.h
- src/colors/kcolormimedata.cpp
src/text/kdatevalidator.cpp
src/text/kdatevalidator.h
-Copyright: 2003, 2008 David Faure <faure at kde.org>
- 1997 Tim D. Gilman (tdgilman at best.org)
- 1999 Steffen Hansen (hansen at kde.org)
- 2005 Joseph Wenninger (jowenn at kde.org)
- 2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
- 2007 Olaf Schmidt <ojschmidt at kde.org>
- 2007 Thomas Zander <zander at kde.org>
- 2007 Zack Rusin <zack at kde.org>
+Copyright: 2003-2008, David Faure <faure at kde.org>
+ 2007, John Layt <john at layt.net>
+ 2005, Joseph Wenninger <jowenn at kde.org>
+ 2007, Matthew Woehlke <mw_triad at users.sourceforge.net>
+ 1998-2001, Mirko Boehm <mirko at kde.org>
+ 2007, Olaf Schmidt <ojschmidt at kde.org>
+ 1999, Steffen Hansen <hansen at kde.org>
+ 2007, Thomas Zander <zander at kde.org>
+ 1997, Tim D. Gilman <tdgilman at best.org>
+ 2007, Zack Rusin <zack at kde.org>
License: LGPL-2+
+
+Files: src/colors/kcolorcollection.h
+ src/colors/kcolorcollection.cpp
+ src/text/kwordwrap.cpp
+ src/text/kwordwrap.h
+ src/util/kimagecache.h
+ src/util/klocalimagecacheimpl.h
+ src/util/klocalimagecacheimpl.cpp
+Copyright: 2001, David Faure <faure at kde.org>
+ 2010, Michael Pyne <mpyne at kde.org>
+ 1999, Waldo Bastian <bastian at kde.org>
+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.
+ License as published by the Free Software Foundation; version
+ 2 of the License.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -67,37 +82,33 @@ 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".
-Files: src/colors/kcolorcollection.h
- src/text/kwordwrap.h
- src/text/kwordwrap.cpp
- src/util/klocalimagecacheimpl.h
- src/util/klocalimagecacheimpl.cpp
- src/util/kimagecache.h
-Copyright: 2010 Michael Pyne <mpyne at kde.org>
- 1999 Waldo Bastian (bastian at kde.org)
- 2001 David Faure <faure at kde.org>
-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; version
- 2 of the License.
+Files: tests/openurltest.cpp
+Copyright: 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+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
+ your option ) version 3 or, at the discretion of KDE e.V. ( which shall
+ act as a proxy as in section 14 of the GPLv3 ), 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.
.
- You should have received a copy of the GNU Library General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
.
- 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",
+ likewise, the version 3 of the GNU Lesser General Public License can be found
+ in "/usr/share/common-licenses/LGPL-3".
Files: tests/kmodifierkeyinfotest.cpp
Copyright: Michael Leupold <lemma at confuego.org>
-License: GPL-2+ as approved by KDE e.V.
+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
@@ -114,24 +125,30 @@ License: GPL-2+ as approved by KDE e.V.
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".
+ 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
+ GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
Files: debian/*
Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
-License: GPL-2+
- This package 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) any later version.
+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 package 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
+ Library 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/>
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-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".
--
kguiaddons packaging
More information about the pkg-kde-commits
mailing list