[SCM] kservice packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g0a6b8fe
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:03:18 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kservice.git;a=commitdiff;h=cf2c986
The following commit has been merged in the kubuntu_unstable branch:
commit cf2c986250c3930843dd9a7b8a6fd7955c679af8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 25 13:32:28 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 279 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 173 insertions(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 768d1f8..32e20ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kservice (5.8.0-1) experimental; urgency=medium
* New upstream release (5.8.0).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Sun, 22 Mar 2015 11:39:07 +0100
diff --git a/debian/copyright b/debian/copyright
index 7ade71b..2cab72e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,23 +13,24 @@ Copyright: 2006, Aaron Seigo <aseigo at kde.org>
2013, Sebastian Kügler <sebas at kde.org>
1999-2000, Torben Weis <weis at kde.org>
1999-2003, Waldo Bastian <bastian at kde.org>
+ 2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna
+ 2006, Canonical Ltd, and Rosetta Contributors 2006
+ 1998, Erez Nir <erez-n at actcom.co.il>
+ 1997-2009, Free Software Foundation, Inc
+ 2008-2009, K Desktop Environment
+ 2005, KDE Armenian translation team
+ 1999-2002, KDE Developers
+ 2005, KDE Russian translation team
+ 2000-2003, KDE e.v
+ 2007, KDE i18n Project for Vietnamese
+ 1999-2003, Meni Livne <livne at kde.org>
+ 2008, This_file_is_part_of_KDE
+ 2001, translate.org.za
+ 1999-2002, กลุ่มผู้พัฒนา KDE
+ 1999, David Faure <faure at kde.org>
+ 2003-2007, Matthias Kretz <kretz at kde.org>
+ 2002-2003, 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 version 2 as published by the Free Software Foundation.
- .
- 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
- 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".
Files: autotests/ksycocadicttest.cpp
autotests/pluginlocatortest.cpp
@@ -79,29 +80,111 @@ Copyright: 2006-2008, Aaron Seigo <aseigo at kde.org>
1999-2004, Waldo Bastian <bastian at kde.org>
License: LGPL-2+
-Files: src/sycoca/sycocadebug.cpp
+Files: autotests/kmimeassociationstest.cpp
+ autotests/ksycocathreadtest.cpp
+ src/kbuildsycoca/kbuildsycocainterface.h
+ src/kbuildsycoca/kmimeassociations.cpp
+ src/kbuildsycoca/kmimeassociations.h
+ src/sycoca/ksycocadevices_p.h
+Copyright: 2008-2009, David Faure <faure at kde.org>
+License: LGPL-2+3+KDEeV
+
+Files: po/ca/kservice5.po
+ po/ca at valencia/kservice5.po
+ po/uk/kservice5.po
+ tests/findservice.cpp
+Copyright: 2014, Alex Merry <alex.merry at kde.org>
+ 1998-2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
+Files: COPYING.LIB
+ src/sycoca/sycocadebug.cpp
src/sycoca/sycocadebug.h
-Copyright: No copyright claimed
+Copyright: 1991-1999, Free Software Foundation, Inc
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
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+
+Files: autotests/fakeplugin.desktop
+ autotests/fakeplugin.json
+ autotests/noplugin.desktop
+Copyright: No copyright claimed
+License: LGPL
+
+Files: COPYING
+ tests/pluginlocator/main.cpp
+Copyright: 1989-1991, Free Software Foundation, Inc
+ 2013, Sebastian Kügler <sebas at kde.org>
+License: GPL-2+
+
+Files: autotests/nsaplugin.cpp
+ autotests/nsaplugin.h
+Copyright: 2013, Sebastian Kügler <sebas at kde.org>
+License: GPL-2+3+KDEeV
+
+Files: src/services/yacc.c
+ src/services/yacc.h
+Copyright: 1984-2006, Free Software Foundation, Inc.
+License: GPL-3+_BisonException
+
+Files: COPYING.GPL3
+Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
+License: GPL-3+
+
+Files: po/bg/kservice5.po
+Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
+ 2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+License: GPL
+ This file is licensed under the GPL.
.
- This library is distributed in the hope that it will be useful,
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL'.
+
+License: GPL-2+
+ 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,
+ or (at your option) any later version.
+ .
+ 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
- Lesser General Public License for more details.
+ 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 Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU Library General Public
+ License along with this program; 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 General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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".
-Files: src/services/yacc.c
- src/services/yacc.h
-Copyright: 1984-2006 Free Software Foundation, Inc.
License: GPL-3+_BisonException
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
@@ -132,84 +215,49 @@ License: GPL-3+_BisonException
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-Files: autotests/nsaplugin.cpp
- autotests/nsaplugin.h
-Copyright: 2013, Sebastian Kügler <sebas at kde.org>
-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.
+License: LGPL
+ X-KDE-PluginInfo-License=LGPL
.
- 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".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL'.
-Files: tests/pluginlocator/main.cpp
-Copyright: 2013, Sebastian Kügler <sebas at kde.org>
-License: GPL-2+
- 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,
- or (at your option) any later version.
+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 version 2 as published by the Free Software Foundation.
.
- 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
+ Library General Public License for more details.
.
- You should have received a copy of the GNU Library General Public
- License along with this program; 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 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".
-Files: tests/findservice.cpp
-Copyright: 2014, Alex Merry <alex.merry at kde.org>
-License: LGPL-2.1+3+KDEeV
+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) 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.
+ 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, 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 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".
+ 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: autotests/kmimeassociationstest.cpp
- autotests/ksycocathreadtest.cpp
- src/kbuildsycoca/kbuildsycocainterface.h
- src/kbuildsycoca/kmimeassociations.cpp
- src/kbuildsycoca/kmimeassociations.h
- src/sycoca/ksycocadevices_p.h
-Copyright: 2008-2009, David Faure <faure 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
@@ -232,25 +280,42 @@ License: LGPL-2+3+KDEeV
the complete text of the GNU Lesser General Public License version 3 can be
found in "/usr/share/common-licenses/LGPL-3".
-Files: debian/*
-Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-2+
+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
+ License as published by the Free Software Foundation; either
+ 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
+ Lesser 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, 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".
-License: LGPL-2+
+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 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) 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 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, see
+ <http://www.gnu.org/licenses/>.
.
- 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", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-licenses/LGPL-3".
--
kservice packaging
More information about the pkg-kde-commits
mailing list