[SCM] kbruch packaging branch, master, updated. debian/4.7.4-2-6-g972647c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 972647c4c89c06dace9c2d39d9be8164fc2a1ec8
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 17 15:26:36 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index db4469d..6c82365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kbruch (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 15:16:25 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b4d4486..ab70afb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,23 @@
-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: kbruch
 Source: http://www.kde.org
 
 Files: *
-Copyright: 2008 Tadeu Araujo <tadeu.araujo at ltia.fc.unesp.br>
+Copyright: 2001-2011 Sebastian Stein <seb.kde at hpfsc.de>
+           2008 Tadeu Araujo <tadeu.araujo at ltia.fc.unesp.br>
            2008 Danilo Balzaque <danilo.balzaque at ltia.fc.unesp.br>
-           2001-2011 Sebastian Stein 
            2008 Tiago Porangaba <tiago.porangaba at ltia.fc.unesp.br>
 License: GPL-2+
 
 Files: doc/*
 Copyright: 2001-2005, Sebastian Stein <seb.kde at hpfsc.de>
            2008, Anne-Marie Mahfouf <annma at kde.org>
-License: GFDL-1.2
+           2010, Lauri Watts
+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.ubuntu.com>
+Copyright: 2011, Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+           2011-2012, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -36,13 +37,11 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/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.
-  A copy of the license is included in the section entitled "GNU
-  Free Documentation License".
-  .
-  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: 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'.

-- 
kbruch packaging