[SCM] kmouth packaging branch, master, updated. debian/4.8.4-2-3-gfc3985b

[Lisandro Damián Nicanor Pérez]

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

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

    Fix 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 0e7dfea..47ac41e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kmouth (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:38:24 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 260adcd..2f740ec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,11 @@ License: GPL-2.0+
 Files: doc/*
 Copyright: 2002-2003 Gunnar Schmi Dt <gunnar at schmi-dt.de>
            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: debian/*
 Copyright: 2012 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
@@ -32,7 +36,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;

-- 
kmouth packaging