[SCM] kscreen packaging branch, master, updated. debian/1.0.2.1-1-38-g511db13

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=94eba0a

The following commit has been merged in the master branch:
commit 94eba0aa21e1a35230a9d4e2d22a771c62b4a677
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 9 21:52:17 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 78 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f26db14..a0bf2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kscreen (4:5.2.0-1~) UNRELEASED; urgency=medium
 
   * Prepare initial Debian release.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 09 Feb 2015 16:11:35 +0100
 
diff --git a/debian/copyright b/debian/copyright
index daefc34..162cfaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,21 +3,10 @@ Upstream-Name: kscreen
 Source: git://anongit.kde.org/kscreen
 
 Files: *
-Copyright: 2012 by Alejandro Fiestas Olivares <afiestas at kde.org>
-License: GPL-2.0+
-
-
-Files: kcm/src/* kcm/qml/*
-Copyright: 2012,2013 Dan Vratil <dvratil at redhat.com>
-           2011 Marco Martin <mart at kde.org>
-License: LGPL-2.1+
-
-Files: debian/*
-Copyright: 2012, 2013 Achim Bohnet <allee at kubuntu.org>
-           2014 Scarlett Clark <sgclark at kubuntu.org>
-License: LGPL-2.1+
-
-License: GPL-2.0+
+Copyright: 2012, Alejandro Fiestas Olivares <afiestas at kde.org>
+           2013-2015, Daniel Vrátil <dvratil at redhat.com>
+           1989-1991, Free Software Foundation, Inc
+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
  the Free Software Foundation; either version 2 of the License, or
@@ -31,8 +20,63 @@ License: GPL-2.0+
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/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".
+
+Files: kcm/src/collapsablebutton.cpp
+       kcm/src/collapsablebutton.h
+       kcm/src/controlpanel.cpp
+       kcm/src/controlpanel.h
+       kcm/src/outputconfig.cpp
+       kcm/src/outputconfig.h
+       kcm/src/resolutionslider.cpp
+       kcm/src/resolutionslider.h
+       kcm/src/unifiedoutputconfig.cpp
+       kcm/src/unifiedoutputconfig.h
+       kcm/src/utils.cpp
+       kcm/src/utils.h
+       plasma/kscreenapplet.cpp
+       plasma/kscreenapplet.h
+Copyright: 2013, Dan Vratil <dvratil at redhat.com>
+License: GPL-2+3+KDEeV
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2", likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ "/usr/share/common-licenses/GPL-3".
+
+Files: kcm/qml/Output.qml
+       kcm/qml/OutputIdentifier.qml
+       kcm/qml/main.qml
+       kcm/src/declarative/qmloutput.cpp
+       kcm/src/declarative/qmloutput.h
+       kcm/src/kcm_kscreen.h
+       kded/debug.cpp
+       kded/debug.h
+       plasma/package/contents/ui/ActionIcon.qml
+       plasma/package/contents/ui/main.qml
+Copyright: 2012-2014, Daniel Vratil <dvratil at redhat.com>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2012, 2013 Achim Bohnet <allee at kubuntu.org>
+           2014 Scarlett Clark <sgclark at kubuntu.org>
+License: LGPL-2.1+
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or

-- 
kscreen packaging