[SCM] kmag packaging branch, master, updated. debian/4.8.4-2-2-g454e822

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 454e82290a949626d51b6a0f19128ff7269e0d29
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 21 12:54:14 2012 -0300

    Improve 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 |    6 +++++-
 debian/copyright |    8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abd783d..6f57061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kmag (4:4.8.4-1) 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 12:49:11 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 2229253..f1ea270 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,11 @@ Files: doc/*
 Copyright: 2000-2002 Sarang Lakare <sarang at users.sourceforge.net>
            2004-2005 Olaf Schmidt <ojschmidt at kde.org>
            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>
@@ -36,7 +40,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;

-- 
kmag packaging