[SCM] kactivities packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g47a9b5a
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 12:55:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=f43a05a
The following commit has been merged in the kubuntu_wily_archive branch:
commit f43a05a79d43280cb055218b4de9c139a67464ad
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Feb 3 17:19:59 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 104 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8304bd5..d113e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kactivities-kf5 (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> Mon, 26 Jan 2015 15:23:45 +0100
diff --git a/debian/copyright b/debian/copyright
index 7adee1e..ab1f9db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,10 @@ Upstream-Name: kactivities
Source: https://projects.kde.org/projects/frameworks/kactivities
Files: *
- debian/*
-Copyright: 2010-2013 Ivan Cukic <ivan.cukic at kde.org>
- 2012 Makis Marimpis <makhsm at gmail.com>
- 2008 Aaron Seigo <aseigo at kde.org>
- 2012 Patrick von Reth <patrick.vonreth at gmail.com>
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2013, Heena Mahour <heena393 at gmail.com>
+ 2011-2014, Ivan Cukic <ivan.cukic(at)kde.org>
+ 2012, Makis Marimpis <makhsm at gmail.com>
+ 2013, Sebastian Kügler <sebas at kde.org>
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
@@ -23,8 +21,27 @@ License: GPL-2+
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".
+
+Files: src/imports/activitiesextensionplugin.cpp
+ src/imports/activitiesextensionplugin.h
+ src/lib/core/mainthreadexecutor_p.cpp
+ src/lib/core/mainthreadexecutor_p.h
+ src/lib/core/manager_p.cpp
+ src/lib/core/manager_p.h
+ src/lib/core/resourceinstance.h
+ src/lib/core/version.cpp
+ src/lib/core/version.h
+ src/utils/d_ptr.h
+ src/utils/d_ptr_implementation.h
+ src/utils/for_each_assoc.h
+ src/utils/merge_into.h
+ src/utils/range.h
+ src/utils/remove_if.h
+Copyright: 2010-2014, Ivan Cukic <ivan.cukic(at)kde.org>
+ 2008, Aaron Seigo <aseigo at kde.org>
+License: LGPL-2+
Files: src/lib/core/consumer.cpp
src/lib/core/consumer.h
@@ -35,7 +52,7 @@ Files: src/lib/core/consumer.cpp
src/lib/core/info.cpp
src/lib/core/info.h
src/lib/core/info_p.h
-Copyright: 2010, 2011, 2012, 2013 Ivan Cukic <ivan.cukic(at)kde.org>
+Copyright: 2010-2012, Ivan Cukic <ivan.cukic(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
@@ -54,20 +71,61 @@ 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/imports/activitiesextensionplugin.cpp
- src/imports/activitiesextensionplugin.h
- src/lib/core/manager_p.cpp
- src/lib/core/manager_p.h
- src/lib/core/resourceinstance.h
- src/lib/core/version.cpp
- src/lib/core/version.h
- src/lib/models/activitiescomponentplugin.cpp
- src/lib/models/activitiescomponentplugin.h
- src/lib/models/kactivities_models_export.h
- src/utils/* excluding:
-Copyright: 2010, 2011, 2012 Ivan Cukic <ivan.cukic(at)kde.org>
- 2008 by Aaron Seigo <aseigo at kde.org>
- 2012 Patrick von Reth <patrick.vonreth at gmail.com>
+Files: src/utils/continue_with.h
+Copyright: 2014, Ivan Čukić <ivan.cukic at kde.org>
+License: Expat
+ Distributed under terms of the MIT license.
+ .
+ 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.
+
+Files: src/common/database/Database.cpp
+ src/common/database/Database.h
+ src/workspace/kio/KioActivities.cpp
+ src/workspace/kio/KioActivities.h
+Copyright: 2012-2014, Ivan Cukic <ivan.cukic 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.
+ .
+ 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 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: 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
--
kactivities packaging
More information about the pkg-kde-commits
mailing list