[SCM] khotkeys packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-47-g969f085

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 61ca70277b46a088ba139279d65038777dd630ac
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 16 09:54:32 2015 +0000

    keep lintian happy
---
 debian/copyright | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e128c3a..7a6121b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -96,6 +96,15 @@ License: LGPL-2.1+3+KDEeV
 Files: doc/en/kcm/index.docbook
        doc/en_US/kcm/index.docbook
 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'.
 
 Files: libkhotkeysprivate/triggers/gesture_trigger.cpp
 Copyright: 1999-2001, Lubos Lunak <l.lunak at kde.org>
@@ -149,17 +158,6 @@ 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

-- 
khotkeys packaging