[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-8-27-g15d9dd9
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 5 22:19:04 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=2f8bd94
The following commit has been merged in the master branch:
commit 2f8bd94eb72f826d36bc7840452da395ac4c5b9b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Sep 5 20:24:15 2015 +0200
Update copyright file.
---
debian/changelog | 1 +
debian/copyright | 237 ++++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 211 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a3e9e27..6b34b74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ akonadi (15.08.0-1~) UNRELEASED; urgency=medium
* New upstream release (15.08.0).
* Remove upstream patches.
* Refresh patches.
+ * Update copyright file.
-- Maximiliano Curia <maxy at debian.org> Sat, 05 Sep 2015 12:40:38 +0200
diff --git a/debian/copyright b/debian/copyright
index 890a38b..1899efc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,7 @@ Copyright:
2002 Holger Freyther <freyther at kde.org>
2006 Ingo Kloecker <kloecker at kde.org>
2007-2008 Kevin Krammer <kevin.krammer at gmx.at>
+ 2015 Laurent Montel <montel at kde.org>
2010 Marc Mutz <mutz at kde.org>
1997 Matthias Kalle Dalheimer <kalle at kde.org>
2010 Michael Jansen <kde at michael-jansen>
@@ -33,24 +34,145 @@ License: LGPL-2+
Comment:
See full list of contributors in "AUTHORS" file.
-Files:
- qsqlite/src/QtSql/private/qsqlcachedresult_p.h
- qsqlite/src/qsql_sqlite.cpp
- qsqlite/src/qsql_sqlite.h
- qsqlite/src/smain.cpp
-Copyright: 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+Files: autotests/server/dbpopulator.h
+ autotests/server/fakeclient.cpp
+ autotests/server/fakeclient.h
+ autotests/server/fakesearchmanager.cpp
+ autotests/server/fakesearchmanager.h
+ autotests/server/partstreamertest.cpp
+ autotests/server/searchtest.cpp
+ src/server/connectionthread.cpp
+ src/server/connectionthread.h
+ src/server/storage/collectionstatistics.cpp
+ src/server/storage/collectionstatistics.h
+ src/server/storage/partstreamer.cpp
+ src/server/storage/partstreamer.h
+Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
+License: LGPL-2.1+
+
+Files: autotests/server/fakeakonadiserver.cpp
+ autotests/server/fakeakonadiserver.h
+ src/server/commandcontext.cpp
+ src/server/commandcontext.h
+ src/server/storage/storagedebugger.cpp
+ src/server/storage/storagedebugger.h
+Copyright: 2013-2014, Daniel Vrátil <dvratil at redhat.com>
+License: GPL-2+
+
+Files: src/qsqlite/src/QtSql/private/qobject_p.h
+ src/qsqlite/src/QtSql/private/qsqlcachedresult_p.h
+ src/qsqlite/src/QtSql/private/qsqldriver_p.h
+ src/qsqlite/src/qsql_sqlite.cpp
+Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
+ 2009-2010, Nokia Corporation and/or its subsidiary(-ies)
+ 2013, Olivier Goffart <ogoffart at woboq.com>
+License: GPL-3_or_LGPL-2.1-QTexception-1.1
+ $QT_BEGIN_LICENSE:LGPL$
+ Commercial Usage
+ Licensees holding valid Qt Commercial licenses may use this file in
+ accordance with the Qt Commercial License Agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Nokia.
+ .
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Nokia gives you certain additional
+ rights. These rights are described in the Nokia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ If you have questions regarding the use of this file, please contact
+ Nokia at qt-info at nokia.com.
+ $QT_END_LICENSE$
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3', likewise, 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: src/private/datastream_p.cpp
+ src/private/datastream_p_p.h
+ src/server/handler/searchresult.cpp
+ src/server/handler/searchresult.h
+Copyright: 2013-2015, Daniel Vrátil <dvratil at redhat.com>
+License: GPL-2+3+KDEeV
+
+Files: cmake/modules/COPYING-CMAKE-SCRIPTS
+ cmake/modules/FindSqlite.cmake
+ cmake/modules/cmake-copyright.txt
+Copyright: 2010, Christophe Giboudeaux <cgiboudeaux at gmail.com>
+ 2014, Daniel Vrátil <dvratil at redhat.com>
+ 2008, Gilles Caulier <caulier.gilles at gmail.com>
+ 2000-2009, Kitware, Inc., Insight Software Consortium
+License: BSD-3-clause
+
+Files: src/qsqlite/src/qsql_sqlite.h
+ src/qsqlite/src/smain.cpp
+Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
+License: GPL-3_or_LGPL-2.1-QTexception-1.0
+ $QT_BEGIN_LICENSE:LGPL$
+ Commercial Usage
+ Licensees holding valid Qt Commercial licenses may use this file in
+ accordance with the Qt Commercial License Agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Nokia.
+ .
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Nokia gives you certain
+ additional rights. These rights are described in the Nokia Qt LGPL
+ Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+ package.
+ .
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ If you are unsure which license is appropriate for your use, please
+ contact the sales department at http://www.qtsoftware.com/contact.
+ $QT_END_LICENSE$
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3', likewise, the
+ complete text of the GNU Lesser General Public License version 2.1 can be
+ found in `/usr/share/common-licenses/LGPL-2.1'.
+ above.
+
+Files: cmake/modules/FindASan.cmake
+Copyright: 2013, Matthew Arsenault
+License: Expat
+
+Files: cmake/modules/FindBacktrace.cmake
+Copyright: 2013, Vadim Zhukov <persgray at gmail.com>
+License: ISC
+
+Files: debian/*
+Copyright: 2008-2015 Debian Qt/KDE Maintainers
License: LGPL-2.1+
-Files: cmake/modules/*
-Copyright:
- 2007 Christian Ehrlicher <ch.ehrlicher at gmx.de>
- 2010 Christophe Giboudeaux <cgiboudeaux at gmail.com>
- 2006 David Faure, <faure at kde.org>
- 2008 Gilles Caulier <caulier.gilles at gmail.com>
- 2000-2011 Kitware, Inc., Insight Software Consortium
- 2008 Kevin Krammer <kevin.krammer at gmx.at>
- 2007 Pino Toscano <toscano.pino at tiscali.it>
- 2007 Will Stephenson <wstephenson at kde.org>
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -76,11 +198,72 @@ License: BSD-3-clause
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Comment:
Some cmake modules references a nonexistant file. That file is in kdelibs
- source package and in cmake source package with the following content:
+ source package and in cmake source package with the content shown listed
-Files: debian/*
-Copyright: 2008-2015 Debian Qt/KDE Maintainers
-License: LGPL-2.1+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ 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-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 of the License, 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 General Public License for more details.
+ .
+ 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.
+ .
+ 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'.
+
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
License: LGPL-2+
This library is free software; you can redistribute it and/or modify it
@@ -93,19 +276,19 @@ License: LGPL-2+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
.
- The complete text of the GNU Library General Public License
- can be found in "/usr/share/common-licenses/LGPL-2".
+ The complete text of the GNU Library General Public License version 2
+ can be found in `/usr/share/common-licenses/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 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.
.
- The complete text of the GNU Library General Public License
- can be found in "/usr/share/common-licenses/LGPL-2.1".
+ The complete text of the GNU Lesser General Public License version 2.1
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.
--
Akonadi packaging
More information about the pkg-kde-commits
mailing list