[SCM] klettres packaging branch, master, updated. debian/4.7.4-2-6-gd96d170

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit d96d1708fc0dc44c45163286c07195e63793502f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 15:59:06 2012 +0200

    copyright: convert to copyright-format v1.0, fix/update
---
 debian/changelog |    1 +
 debian/copyright |   26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48b54e1..aca2f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ klettres (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to 4.8.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Add watch file.
+  * Convert copyright to copyright-format v1.0 and fix/update.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jun 2012 15:50:03 +0200
 
diff --git a/debian/copyright b/debian/copyright
index aea9239..fa79496 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KLettres
 Upstream-Contact: kde-edu at mail.kde.org
 Source: ftp.kde.org
 
 Files: *
 Copyright: 2001-2011, Anne-Marie Mahfouf <annma at kde.org>
-           2007, Pino Toscano <pino at kde.org>
-           2005, Michael Goettsche <michael.goettsche at kdemail.net>
            2001, Eric Bischoff <e.bischoff at noos.fr>
+           2005, Michael Goettsche <michael.goettsche at kdemail.net>
+           2007, Pino Toscano <pino at kde.org>
 License: GPL-2+
 
 Files: scripts/klettresl10n.rb
@@ -21,11 +21,11 @@ License: LGPL-2
 
 Files: doc/*
 Copyright: 2001-2007, Anne-Marie Mahfouf <annma at kde.org>
-License: GFDL-1.2+
+License: GFDL-NIV-1.2+
 
 Files: debian/*
-Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
+           2011-2012, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: LGPL-2
@@ -70,13 +70,11 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: GFDL-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.
+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 Free Documentation
- License version 1.2 can be found in the file
- `/usr/share/common-licenses/GFDL-1.2'.
-
+ 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'.

-- 
klettres packaging