[SCM] gammaray packaging branch, master, updated. debian/1.2.2-1-15-g6fbd840

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=6fbd840

The following commit has been merged in the master branch:
commit 6fbd84023af1a2fef5ce4e7f94703b7bfb9b8502
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jan 28 22:38:29 2013 +0100

    Updated d/copyright
---
 debian/changelog |    1 +
 debian/copyright |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4e7e80..f5e2c8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ gammaray (1.3.0-1) UNRELEASED; urgency=low
   * Refreshed d/patches/widget-export-actions-location.patch and
     d/patches/gammaray-probe-versioned-soname.patch.
   * Enable KJob tracker plugin.
+  * Updated d/copyright.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 28 Jan 2013 18:29:54 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f63425e..4d87792 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: GammaRay
 
 Files: *
 Copyright: 2006, Bradley T. Hughes
-           2010-2011, Klarälvdalens Datakonsult AB, a KDAB Group company
+           2010-2013, Klarälvdalens Datakonsult AB, a KDAB Group company
 License: GPL-2+
 
 Files: 3rdparty/kde/*
@@ -20,10 +20,6 @@ Files: 3rdparty/qt/*
 Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
 License: LGPL-2.1
 
-Files: cmake/FindQt5Transitional.cmake
-Copyright: 2012, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
-License: BSD-3-clause
-
 Files: cmake/GammaRayMacros.cmake
 Copyright: 2011, Volker Krause <volker.krause at kdab.com>
 License: BSD-3-clause
@@ -63,6 +59,10 @@ Copyright: 2002 Holger Freyther (freyther at kde.org)
            1997, Matthias Kalle Dalheimer (kalle at kde.org)
 License: GPL-2+ or LGPL-2+
 
+Files: debian/*
+Copyright: 2012-2013, Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+License: GPL-2+
+
 License: GPL-2
  For full text of GNU General Public License v2 see
  /usr/share/common-licenses/GPL-2.

-- 
gammaray packaging