[SCM] ktouch packaging branch, master, updated. debian/4.7.4-2-6-g872ec82

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 872ec825d32a5c136e78b89c509ccd0a737ea18d
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 16:24:35 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 016cbb9..91722c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ktouch (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 16:14:20 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5ff3941..d999686 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KTouch
 Upstream-Contact: kde-edu at mail.kde.org
 Source: ftp.kde.org
@@ -11,11 +11,11 @@ License: GPL-2+
 Files: doc/*
 Copyright: 1999-2007, Håvard Frøiland <haavard at users.sourceforge.net>
            1999-2007, Andreas Nicolai <ghorwin at users.sourceforge.net>
-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: GPL-2+
@@ -40,12 +40,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'.

-- 
ktouch packaging