[SCM] filelight packaging branch, master, updated. debian/4.8.4-1-2-g0cae0ff

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 0cae0ff6ba66129d962ab09d4228de6ef92860fe
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 30 19:37:22 2012 +0100

    copyright: fix/improve information
---
 debian/changelog |    2 ++
 debian/copyright |   41 ++++++++++++++---------------------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2be7c8..0c97765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 filelight (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * copyright: fix/improve information.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Dec 2012 19:19:57 +0100
 
diff --git a/debian/copyright b/debian/copyright
index a3a4c93..c5af1e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,12 +10,16 @@ License: GPL-2+ or GPL-3+ with KDE e.V. exception
 Files:  doc/*
 Copyright: 2003-2004, Max Howell <max.howell at methylblue.com>
            2008-2009  Martin Sandsmark <sandsmark at samfundet.no>
-License: GFDL-NIV-1.2
+License: GFDL-NIV-1.2+
 
 Files: debian/*
 Copyright: 2012, Eshat Cakar <info at eshat.de>
 License: GPL-2+
 
+License: GPL-2+
+ 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: GPL-2+ or GPL-3+ with KDE e.V. exception
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@@ -33,32 +37,15 @@ License: GPL-2+ or GPL-3+ with KDE e.V. exception
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
+ On Debian systems, the full text of the GNU General Public License
+ versions 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
  `/usr/share/common-licenses/GPL-3'.
 
-License: GFDL-NIV-1.2
- The purpose of this License is to make a manual, textbook, or other
- functional and useful document "free" in the sense of freedom: to
- assure everyone the effective freedom to copy and redistribute it,
- with or without modifying it, either commercially or noncommercially.
- Secondarily, this License preserves for the author and publisher a way
- to get credit for their work, while not being considered responsible
- for modifications made by others.
- .
- This License is a kind of "copyleft", which means that derivative
- works of the document must themselves be free in the same sense.  It
- complements the GNU General Public License, which is a copyleft
- license designed for free software.
- .
- We have designed this License in order to use it for manuals for free
- software, because free software needs free documentation: a free
- program should come with manuals providing the same freedoms that the
- software does.  But this License is not limited to software manuals;
- it can be used for any textual work, regardless of subject matter or
- whether it is published as a printed book.  We recommend this License
- principally for works whose purpose is instruction or reference.
+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.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GFDL-1.2'.
\ No newline at end of file
+ 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'.

-- 
filelight packaging