[SCM] kactivitymanagerd packaging branch, master, updated. 6b0a0d44f2918f589cd83c9dcd25ddb75c39ccf5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kactivitymanagerd.git;a=commitdiff;h=6b0a0d4

The following commit has been merged in the master branch:
commit 6b0a0d44f2918f589cd83c9dcd25ddb75c39ccf5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Apr 6 19:56:01 2016 +0200

    Update copyright information.
---
 debian/copyright | 105 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 80 insertions(+), 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 88b874e..e7f8850 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,34 +3,48 @@ Upstream-Name: kactivitymanagerd
 Source: https://projects.kde.org/projects/kde/workspace/kactivitymanagerd
 
 Files: *
-       debian/
-Copyright: 2014-2016 Ivan Cukic <ivan.cukic at kde.org>
+Copyright: 2010-2016 Ivan Cukic <ivan.cukic at kde.org>
+Copyright: GPL-2+3+KDEeV
+
+Files: po/ca/kactivities5.po
+       po/ca at valencia/kactivities5.po
+       po/uk/kactivities5.po
+Copyright: 2011-2016, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
+Files: COPYING.GPL2
+       src/service/plugins/activitytemplates/TemplatesPlugin.cpp
+       src/service/plugins/activitytemplates/TemplatesPlugin.h
+       src/service/plugins/eventspy/EventSpy.cpp
+       src/service/plugins/eventspy/EventSpy.h
+       src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
+       src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h
+       src/service/plugins/runapplication/RunApplicationPlugin.cpp
+       src/service/plugins/runapplication/RunApplicationPlugin.h
+       src/service/plugins/slc/SlcPlugin.cpp
+       src/service/plugins/slc/SlcPlugin.h
+       src/service/plugins/sqlite/Database.cpp
+       src/service/plugins/sqlite/Database.h
+       src/service/plugins/sqlite/ResourceLinking.cpp
+       src/service/plugins/sqlite/ResourceLinking.h
+       src/service/plugins/sqlite/ResourceScoreCache.cpp
+       src/service/plugins/sqlite/ResourceScoreCache.h
+       src/service/plugins/sqlite/ResourceScoreMaintainer.cpp
+       src/service/plugins/sqlite/ResourceScoreMaintainer.h
+       src/service/plugins/sqlite/StatsPlugin.cpp
+       src/service/plugins/sqlite/StatsPlugin.h
+       src/service/plugins/sqlite/Utils.h
+       src/service/plugins/virtualdesktopswitch/VirtualDesktopSwitchPlugin.cpp
+       src/service/plugins/virtualdesktopswitch/VirtualDesktopSwitchPlugin.h
+Copyright: 1989-1991, Free Software Foundation, Inc
+           2011-2015, Ivan Cukic <ivan.cukic at kde.org>
+           2012, Makis Marimpis <makhsm at gmail.com>
+License: GPL-2+
+
+Files: debian/*
            2016 Jonathan Riddell <jr at jriddell.org>
 License: LGPL-2.1+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
- CHANTABILITY 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 Lesser General Public License
- version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
- the complete text fo the GNU Lesser General Public License versin 3 can be
- found in `/usr/share/common-licenses/LGPL-3'.
 
-Files: src/service/plugins/*
-Copyright: 2011, 2012, 2013, 2014 Ivan Cukic <ivan.cukic at kde.org>
-           2012 Makis Marimpis <makhsm at gmail.com>
 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 version 2,
@@ -49,3 +63,44 @@ License: 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'.
+
+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 fo the GNU General Public License version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-2.1+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
+ CHANTABILITY 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 Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
+ the complete text fo the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.

-- 
kactivitymanagerd packaging