[SCM] ktextwidgets packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g9f4eaf6
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 13:01:37 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktextwidgets.git;a=commitdiff;h=fe8b0b4
The following commit has been merged in the kubuntu_wily_archive branch:
commit fe8b0b44b6477e76998567093064f1c82218a974
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 27 14:09:13 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 128 +++++++++++++++++++++++++++----------------------------
2 files changed, 64 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db44b47..b6ad3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ktextwidgets (5.6.0-1~) UNRELEASED; urgency=medium
* Update build dependencies to build against experimental and to
follow cmake.
* Bump Standards-Version to 3.9.6, no changes needed.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Tue, 27 Jan 2015 13:54:41 +0100
diff --git a/debian/copyright b/debian/copyright
index 4e77fa6..e9d05cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,12 @@ Upstream-Name: ktextwidgets
Source: https://projects.kde.org/projects/frameworks/ktextwidgets
Files: *
-Copyright: 2002, 2008, 2010 David Faure <faure at kde.org>
- 2001 S.R.Haque <srhaque at iee.org>
- 2008 Stephen Kelly <steveire at gmail.com> <steveire at gmailcom>
- 2008-2009 Thomas McGuire <mcguire at kde.org> <thomas.mcguire at gmx.net>
- 2004 Arend van Beelen <arend at auton.nl>
- 2007, 2012 Laurent Montel <montel at kde.org>
- 2002 Carsten Pfeiffer <pfeiffer at kde.org>
- 2002 Jesper K. Pedersen <blackie at kdab.net>
- 2005 Michael Brade <brade at kde.org>
- 2002 Simon Hausmann <hausmann at kde.org>
+Copyright: 2004, Arend van Beelen jr <arend at auton.nl>
+ 2002, David Faure <david at mandrakesoft.com>
+ 2010, David Faure <faure at kde.org>
+ 2001, S.R.Haque <srhaque at iee.org>
+ 2008, Stephen Kelly <steveire at gmail.com>
+ 2008, Thomas McGuire <thomas.mcguire at gmx.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
@@ -32,48 +28,58 @@ License: LGPL-2
Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
Files: autotests/ktextedit_unittest.cpp
- src/kregexpeditor/*
- src/widgets/ktextedit.cpp
- src/widgets/ktextedit.h
- tests/ktextedittest.cpp
- debian/*
-Copyright: 2008 David Faure <faure at kde.org>
- 2008 Stephen Kelly <steveire at gmail.com>
- 2002 Jesper K. Pedersen <blackie at kdab.net>
- 2002 Simon Hausmann <hausmann at kde.org>
- 2007 Laurent Montel <montel at kde.org>
- 2008 Thomas McGuire <thomas.mcguire at gmx.net>
- 2002 Carsten Pfeiffer <pfeiffer at kde.org>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+ src/kregexpeditor/kregexpeditorinterface.h
+ src/widgets/ktextedit.cpp
+ src/widgets/ktextedit.h
+ tests/ktextedittest.cpp
+Copyright: 2002, Carsten Pfeiffer <pfeiffer at kde.org>
+ 2008, David Faure <faure at kde.org>
+ 2002, Jesper K. Pedersen <blackie at kdab.net>
+ 2002, Simon Hausmann <hausmann at kde.org>
+ 2008, Stephen Kelly <steveire at gmail.com>
License: LGPL-2+
+
+Files: autotests/kpluralhandlingspinboxtest.cpp
+ autotests/kpluralhandlingspinboxtest.h
+ src/dialogs/klinkdialog.cpp
+ src/dialogs/klinkdialog_p.h
+ src/widgets/kpluralhandlingspinbox.cpp
+ src/widgets/kpluralhandlingspinbox.h
+ src/widgets/krichtextedit.cpp
+ src/widgets/krichtextedit.h
+ src/widgets/nestedlisthelper.cpp
+ src/widgets/nestedlisthelper_p.h
+Copyright: 2007-2014, Laurent Montel <montel at kde.org>
+ 2008, Stephen Kelly <steveire at gmail.com>
+ 2008, Thomas McGuire <thomas.mcguire at gmx.net>
+License: LGPL-2.1+
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ 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) any later version.
+ version 2.1 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.
+ Lesser General Public License for more details.
.
- 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.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; 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 Lesser General
+ Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
Files: autotests/krichtextedittest.cpp
autotests/krichtextedittest.h
-Copyright: 2009 Thomas McGuire <mcguire at kde.org>
-License: LGPL-2+
+Copyright: 2009, Thomas McGuire <mcguire 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 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.
+ 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
@@ -85,38 +91,30 @@ License: LGPL-2+
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".
-Comment: or 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 Library General Public License version
+ 3 can be found in "/usr/share/common-licenses/LGPL-3".
-Files: autotests/kpluralhandlingspinboxtest.cpp
- autotests/kpluralhandlingspinboxtest.h
- src/widgets/krichtextedit.cpp
- src/widgets/krichtextedit.h
- src/widgets/nestedlisthelper.cpp
- src/widgets/kpluralhandlingspinbox.cpp
- src/widgets/kpluralhandlingspinbox.h
- src/widgets/nestedlisthelper_p.h
- src/dialogs/klinkdialog_p.h
- src/dialogs/klinkdialog.cpp
-Copyright: 2007 Laurent Montel <montel at kde.org>
- 2008 Thomas McGuire <thomas.mcguire at gmx.net>
- 2008 Stephen Kelly <steveire at gmail.com>
-License: LGPL-2.1+
+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 Lesser General Public
+ modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ 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
- Lesser General Public License for more details.
+ Library General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
+ 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 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 Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
--
ktextwidgets packaging
More information about the pkg-kde-commits
mailing list