[SCM] kruler packaging branch, master, updated. debian/4.7.4-2-6-gba5166d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ba5166ddcb26c3595e40d60ae223f4aa8f2858bf
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 23:24:10 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 93b5943..cb09022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kruler (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>  Sat, 16 Jun 2012 23:11:58 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b4f525e..7184d10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,32 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KRuler
 Upstream-Contact: kde-devel at kde.org
 Source: ftp.kde.org
 
 Files: *
 Copyright: 2000-2008, Till Krech <till at snafu.de>
-           2009, Mathias Soeken <msoeken at informatik.uni-bremen.de>
+           2008-2009, Mathias Soeken <msoeken at informatik.uni-bremen.de>
            2009, Montel Laurent <montel at kde.org>
 License: GPL-2+
 
 Files: doc/*
 Copyright: 2001, Lauri Watts
-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.
- .
- 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'.
+License: GFDL-NIV-1.2+
 
 Files: debian/*
 Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
-Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+           2011-2012, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: 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.
+ .
+ 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'.
+
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -44,6 +45,5 @@ License: GPL-2+
  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  Boston, MA  02110-1301 USA
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.

-- 
kruler packaging