[SCM] kcolorchooser packaging branch, master, updated. debian/4.7.4-2-6-g902e971

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 902e9710ca3f59fbd95961455b0fc90fad2ba538
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 17:18:29 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1f20873..ebd074d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kcolorchooser (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 17:13:56 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6182e97..cd8725b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kcolorchooser
 Source: http://www.kde.org
 
@@ -25,7 +25,7 @@ License: MIT
 
 Files: debian/*
 Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.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+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
kcolorchooser packaging