[SCM] kmousetool packaging branch, master, updated. debian/4.8.4-2-3-g161d10b

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kmousetool.git;a=commitdiff;h=161d10b

The following commit has been merged in the master branch:
commit 161d10b531f1a8c265ea689c2be87cf781895eb3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 21 13:35:25 2012 -0300

    Update debian/copyright.
    
    - Correct doc license to GFDL-NIV-1.2+.
    - Add a comment to the doc license to explain why some keywords appear and
      how they are expanded later.
---
 debian/changelog |    4 ++++
 debian/copyright |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df7b604..ca5762c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kmousetool (4:4.8.4-3) UNRELEASED; urgency=low
 
   * The "I missed the epoch" release.
+  * Update debian/copyright:
+    - Correct doc license to GFDL-NIV-1.2+.
+    - Add a comment to the doc license to explain why some keywords appear and
+      how they are expanded later.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Jun 2012 13:29:29 -0300
 
diff --git a/debian/copyright b/debian/copyright
index a8e4922..7ead186 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,11 @@ License: GPL-2.0+
 Files: doc/*
 Copyright: 2002 Jeff Roush <jeff at kmousetool.com>
            2010 Lauri.Watts
-License: GFDL-NIV-1.2
+License: GFDL-NIV-1.2+
+Comment: index.docbook contains the calls &underFDL, &underGPL and &FDLNotice.
+ This serve the purpose to expand the licenses explaining that the doc is under
+ the FDL with no Invariant Sections, with no Front-Cover Texts, and with no
+ Back-Cover Texts and that the program itself is under the GPL.
 
 Files: kmousetool/Xmd_kmousetool.h
 Copyright: 1987-1998  The Open Group
@@ -39,7 +43,7 @@ License: GPL-2.0+
  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: GFDL-NIV-1.2
+License: GFDL-NIV-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;

-- 
kmousetool packaging