[SCM] kscreenlocker packaging branch, master, updated. c9925d66210d028602f39bbbc5e271cf28146299

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreenlocker.git;a=commitdiff;h=3d04864

The following commit has been merged in the master branch:
commit 3d04864382d4a489c99fda51b2642cdc48769fb2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Dec 15 15:05:54 2015 +0100

    Update copyright file.
---
 debian/copyright | 57 +++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c2bb146..c8d1bc1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,52 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kscreenlocker
-Source: <url://example.com>
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+Copyright: 1998, Caldera, Inc
+           2015, Rosetta Contributors and Canonical Ltd 2015
+           2012-2015, This_file_is_part_of_KDE
+           2011, Aaron Seigo <aseigo at kde.org>
+           2015, Bhushan Shah <bhush94 at gmail.com>
+           1998, Caldera, Inc
+           2008, Chani Armitage <chanika at gmail.com>
+           2004, Chris Howells <howells at kde.org>
+           1998, Christian Esken <esken at kde.org>
+           1995, Christophe Wolfhugel
+           2011-2014, David Edmundson <kde at davidedmundson.co.uk>
+           1989-1991, Free Software Foundation, Inc
+           2002, Luboš Luňák <l.lunak at kde.org>
+           2014, Marco Martin <mart at kde.org>
+           1999, Mark Davies <mark at MCS.VUW.AC.NZ>
+           2011-2015, Martin Gräßlin <mgraesslin at kde.org>
+           2011, Martin Klapetek <martin.klapetek at gmail.com>
+           1999, Martin R. Jones <mjones at kde.org>
+           2003, Oswald Buddenhagen <ossi at kde.org>
+           2001, Reza Arbab <arbab at austin.ibm.com>
+License: GPL-2+
+
+Files: po/ca/kscreenlocker.po
+       po/ca/kscreenlocker_greet.po
+       po/ca/screenlocker_kcm.po
+       po/ca at valencia/kscreenlocker.po
+       po/ca at valencia/kscreenlocker_greet.po
+       po/ca at valencia/screenlocker_kcm.po
+       po/uk/kscreenlocker.po
+       po/uk/kscreenlocker_greet.po
+       po/uk/screenlocker_kcm.po
+Copyright: 2012-2015, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
  .
- <Including paragraphs>
+ The complete text of the GNU Lesser General Public License version 2.1 can be
+ found in `/usr/share/common-licenses/LGPL-2.1', likewise, the complete text
+ of the GNU Lesser General Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3'.
 
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2015 Rohan Garg <rohan at kde.org>
+Copyright: 2015, Rohan Garg <rohan at kde.org>
+License: GPL-2+
+
 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
@@ -31,8 +63,3 @@ 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".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

-- 
kscreenlocker packaging