[SCM] kwallet packaging branch, master, updated. debian/4.8.4-1-3-g2348352

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 234835267a0acc47c46f8c13e1d84730514d2ba1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 21 14:08:42 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 |   21 ++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d699f4..0b891f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kwallet (4:4.8.4-2) UNRELEASED; urgency=low
 
   * The "I forgot 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
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 21 Jun 2012 14:01:20 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 94c412e..573c1d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,18 @@ Files: kbetterthankdialogbase.*
 Copyright: 2003-2005 George Staikos <staikos at kde.org>
 License: LGPL-2.0
 
+Files: doc/*
+Copyright: 2003-2005 George Staikos <staikos at kde.org>
+           2003 Lauri Watts
+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: *
 Copyright: 2003-2005 George Staikos <staikos at kde.org>
            2005 Isaac Clerencia <isaac at warp.es>
-           2002 Lauri Watts
 License: GPL-2+
 
 Files: debian/*
@@ -51,3 +59,14 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in "/usr/share/common-licenses/GPL-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;
+ 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
+ can be found in "/usr/share/common-licenses/GFDL-1.2".
\ No newline at end of file

-- 
kwallet packaging