[SCM] kamera packaging branch, master, updated. debian/4.7.4-2-8-g92fb20e

[Pino Toscano]

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

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

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

diff --git a/debian/changelog b/debian/changelog
index 6db41a2..b4892cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ kamera (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>  Fri, 09 Mar 2012 11:17:49 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 350759e..f95e14d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,17 @@
-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/
 Upstream-Name: kamera
 Source: http://www.kde.org
 
 Files: *
 Copyright: 2001 The Kompany
            2001-2003, Ilya Konstantinov <kde-devel at future.shiny.co.il>
-           2001-2007, Marcus Meissner <marcus at jet.franken.de>
+           2001-2008, Marcus Meissner <marcus at jet.franken.de>
            2003, Nadeem Hasan <nhasan at nadmm.com>
 License: GPL-2+
 
 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+
 
 License: GPL-2+

-- 
kamera packaging