[SCM] khotkeys packaging branch, master, updated. 71e391e0c857a4710335da879f120bbeb5b9930b

Fri Jul 3 11:53:14 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khotkeys.git;a=commitdiff;h=9aced43

The following commit has been merged in the master branch:
commit 9aced434eca756a72e89c7be4238042e25e9cf93
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 09:56:27 2015 +0200

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 245 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 164 insertions(+), 82 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a509ad4..617fc2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ khotkeys (4:5.3.2-1~) UNRELEASED; urgency=medium
   * New upstream release (5.3.0).
   * New upstream release (5.3.1).
   * New upstream release (5.3.2).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:02 +0200
 
diff --git a/debian/copyright b/debian/copyright
index cc054c7..e128c3a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,105 @@ Upstream-Name: khotkeys
 Source: https://projects.kde.org/projects/kde/workspace/khotkeys
 
 Files: *
-Copyright: 1999-2001 Lubos Lunak <l.lunak at kde.org>
-           2008 Michael Jansen <kde at michael-jansen.biz>
+Copyright: 2008-2009, Michael Jansen <kde at michael-jansen.biz>
+           2006, Volker Krause <volker.krause at rwth-aachen.de>
+           2000-2014, Free Software Foundation, Inc
+           2000, Jesús Bravo Álvarez
+           2008-2009, K Desktop Environment
+           2000, KDE Team
+           2000-2002, KDE e.v
+           2007, KDE i18n Project for Vietnamese
+           1999-2003, Lubos Lunak <l.lunak at kde.org>
+           2000-2002, Meni Livne <livne at kde.org>
+           2000-2008, Michael Jansen
+           2009, Michael Jansen <kde at michael-jansen.biz>
+           2003, Mike Pilone <mpilone at slac.com>
+           2005, Olivier Goffart <ogoffart at kde.org>
+           2009, Rosetta Contributors and Canonical Ltd 2009
+           2003-2012, This_file_is_part_of_KDE
+           2001, translate.org.za
+           2008, माइकल जानसन
+           2008, माइकल जेनसन
+           माइकेल जेन्सन
+           মাইকেল জ্যানসেন
+           માઇકલ જેનસન
+           മൈക്കള്‍ ജാന്‍സെന്‍
 License: LGPL-2+
+
+Files: libkhotkeysprivate/action_data/menuentry_shortcut_action_data.cpp
+       libkhotkeysprivate/action_data/menuentry_shortcut_action_data.h
+       libkhotkeysprivate/action_data/simple_action_data.cpp
+       libkhotkeysprivate/actions/action.cpp
+       libkhotkeysprivate/actions/action_list.cpp
+       libkhotkeysprivate/actions/activate_window_action.cpp
+       libkhotkeysprivate/actions/command_url_action.cpp
+       libkhotkeysprivate/actions/dbus_action.cpp
+       libkhotkeysprivate/actions/keyboard_input_action.cpp
+       libkhotkeysprivate/actions/menuentry_action.cpp
+       libkhotkeysprivate/conditions/active_window_condition.cpp
+       libkhotkeysprivate/conditions/active_window_condition.h
+       libkhotkeysprivate/conditions/and_condition.cpp
+       libkhotkeysprivate/conditions/condition.cpp
+       libkhotkeysprivate/conditions/condition.h
+       libkhotkeysprivate/conditions/conditions_list.cpp
+       libkhotkeysprivate/conditions/conditions_list.h
+       libkhotkeysprivate/conditions/conditions_list_base.cpp
+       libkhotkeysprivate/conditions/conditions_list_base.h
+       libkhotkeysprivate/conditions/conditions_visitor.cpp
+       libkhotkeysprivate/conditions/conditions_visitor.h
+       libkhotkeysprivate/conditions/existing_window_condition.cpp
+       libkhotkeysprivate/conditions/existing_window_condition.h
+       libkhotkeysprivate/conditions/not_condition.cpp
+       libkhotkeysprivate/conditions/or_condition.cpp
+       libkhotkeysprivate/settings.cpp
+       libkhotkeysprivate/settings_reader_v2.cpp
+       libkhotkeysprivate/settings_reader_v2.h
+       libkhotkeysprivate/settings_writer.cpp
+       libkhotkeysprivate/settings_writer.h
+       libkhotkeysprivate/triggers/shortcut_trigger.cpp
+       libkhotkeysprivate/triggers/trigger.cpp
+       libkhotkeysprivate/triggers/trigger_list.cpp
+       libkhotkeysprivate/triggers/triggers.cpp
+       libkhotkeysprivate/triggers/triggers.h
+       libkhotkeysprivate/triggers/voice_trigger.cpp
+       libkhotkeysprivate/triggers/window_trigger.cpp
+Copyright: 1999-2001, Lubos Lunak <l.lunak at kde.org>
+           2008-2009, Michael Jansen <kde at michael-jansen.biz>
+License: LGPL-2
+
+Files: COPYING
+       libkhotkeysprivate/sound.cpp
+       libkhotkeysprivate/sound.h
+       libkhotkeysprivate/soundrecorder.cpp
+       libkhotkeysprivate/soundrecorder.h
+       libkhotkeysprivate/voicesignature.cpp
+       libkhotkeysprivate/voicesignature.h
+Copyright: 1989-1991, Free Software Foundation, Inc
+           2005, Olivier Goffart
+License: GPL-2+
+
+Files: po/ca/khotkeys.po
+       po/uk/khotkeys.po
+Copyright: Michael Jansen
+           2000-2014, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ --
+ 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: doc/en/kcm/index.docbook
+       doc/en_US/kcm/index.docbook
+License: GFDL-1.2+
+
+Files: libkhotkeysprivate/triggers/gesture_trigger.cpp
+Copyright: 1999-2001, Lubos Lunak <l.lunak at kde.org>
+           2008, Michael Jansen <kde at michael-jansen.biz>
+           2008-2009, EasyStroke, Thomas Jaeger <ThJaeger at gmail.com>
+License: ISC_and_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.
@@ -20,28 +116,55 @@ 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 Lesser General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2.1".
+ This file includes code from EasyStroke, Copyright (c) 2008-2009,
+ Thomas Jaeger <ThJaeger at gmail.com>
+ http://easystroke.sourceforge.net
+ .
+ Permission to use, copy, modify, and/or 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.
+ --
+ 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: libkhotkeysprivate/sound.cpp
-       libkhotkeysprivate/sound.h
-       libkhotkeysprivate/soundrecorder.cpp
-       libkhotkeysprivate/soundrecorder.h
-       libkhotkeysprivate/voicesignature.cpp
-       libkhotkeysprivate/voicesignature.h
-       libkhotkeysprivate/windows_handler.h
-       debian/*
-Copyright: 1999-2001 Lubos Lunak <l.lunak at kde.org>
-           2008 Michael Jansen <kde at michael-jansen.biz>
-           2014 Jonathan Riddell <jr at jriddell.org>
-License: GPL-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.
+Files: po/bg/khotkeys.po
+Copyright: Michael Jansen
+           2009-2011, Yasen Pramatarov <yasen at lindeas.com>
+           2006-2008, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+ This file is licensed under the GPL.
+ --
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: 2014, Jonathan Riddell <jr at jriddell.org>
+License: GPL-2+
+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ --
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
+
+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
@@ -49,16 +172,14 @@ License: GPL-KDEeV
  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/>.
- .
+ 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 General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: libkhotkeysprivate/triggers/*
-       libkhotkeysprivate/windows_helper/*
-Copyright: 1999-2001 Lubos Lunak <l.lunak at kde.org>
-           2008 Michael Jansen <kde at michael-jansen.biz>
-License: GPL-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
  License version 2 as published by the Free Software Foundation.
@@ -72,64 +193,24 @@ License: GPL-2
  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".
+ Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
-Files: libkhotkeysprivate/settings_writer.cpp
- libkhotkeysprivate/settings_writer.h
- libkhotkeysprivate/settings_reader_v2.cpp
- libkhotkeysprivate/actions/keyboard_input_action.cpp
- libkhotkeysprivate/actions/action.cpp
- libkhotkeysprivate/actions/menuentry_action.cpp
- libkhotkeysprivate/actions/activate_window_action.cpp
- libkhotkeysprivate/actions/command_url_action.cpp
- libkhotkeysprivate/actions/dbus_action.cpp
- libkhotkeysprivate/actions/action_list.cpp
- libkhotkeysprivate/conditions/conditions_list.h
- libkhotkeysprivate/conditions/existing_window_condition.cpp
- libkhotkeysprivate/conditions/conditions_visitor.h
- libkhotkeysprivate/conditions/conditions_list.cpp
- libkhotkeysprivate/conditions/condition.cpp
- libkhotkeysprivate/conditions/active_window_condition.h
- libkhotkeysprivate/conditions/or_condition.cpp
- libkhotkeysprivate/conditions/and_condition.cpp
- libkhotkeysprivate/conditions/conditions_list_base.cpp
- libkhotkeysprivate/conditions/active_window_condition.cpp
- libkhotkeysprivate/conditions/conditions_visitor.cpp
- libkhotkeysprivate/conditions/conditions_list_base.h
- libkhotkeysprivate/conditions/condition.h
- libkhotkeysprivate/conditions/existing_window_condition.h
- libkhotkeysprivate/conditions/not_condition.cpp
- libkhotkeysprivate/action_data/simple_action_data.cpp
- libkhotkeysprivate/action_data/menuentry_shortcut_action_data.h
- libkhotkeysprivate/action_data/menuentry_shortcut_action_data.cpp
- libkhotkeysprivate/settings_reader_v2.h
- libkhotkeysprivate/settings.cpp
- libkhotkeysprivate/triggers/voice_trigger.cpp
- libkhotkeysprivate/triggers/trigger_list.cpp
- libkhotkeysprivate/triggers/shortcut_trigger.cpp
- libkhotkeysprivate/triggers/triggers.cpp
- libkhotkeysprivate/triggers/gesture_trigger.cpp
- libkhotkeysprivate/triggers/trigger.cpp
- libkhotkeysprivate/triggers/window_trigger.cpp
- libkhotkeysprivate/triggers/triggers.h
-Copyright: 1999-2001 Lubos Lunak <l.lunak at kde.org>
-           2009 Michael Jansen <kde at michael-jansen.biz>
-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.
+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
+ 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
+ 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/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'.

-- 
khotkeys packaging

