[SCM] step packaging branch, master, updated. debian/4.7.4-2-6-gccb7848

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ccb7848ef584bf0a0d91f7b53f34b66238cbfb11
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 20:03:06 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a4cdd1d..79994fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ step (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 19:43:46 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 607fd0d..1d0529d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,16 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2007, 2009 Vladimir Kuznetsov <ks.vladimir at gmail.com>
 License: GPL-2+
 
 Files: doc/*
-Copyright: 2007 Anne-Marie Mahfouf
-License: GFDL-1.2+
+Copyright: 2007, Anne-Marie Mahfouf <annma at kde.org>
+License: GFDL-NIV-1.2+
 
 Files: debian/*
 Copyright: 2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+           2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
 License: GPL-2+
 
 Files: cmake/*
@@ -39,15 +39,14 @@ License: GPL-2+
  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'.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without

-- 
step packaging