[SCM] kscreenlocker packaging branch, kubuntu_xenial_archive, updated. 992a40bb640259ed6b7229047c73113df8a6d8fc
Philip Muškovac
yofel-guest at moszumanska.debian.org
Tue Jan 5 14:36:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreenlocker.git;a=commitdiff;h=992a40b
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 992a40bb640259ed6b7229047c73113df8a6d8fc
Merge: 1b085801a97b20c19a046d1c1aa8cb47c1f133c1 c9925d66210d028602f39bbbc5e271cf28146299
Author: Philip Muškovac <yofel at gmx.net>
Date: Tue Jan 5 15:36:19 2016 +0100
Merge with master
debian/changelog | 22 ++++++++------
debian/control | 32 ++++++++++----------
debian/copyright | 53 +++++++++++++++++++++++++++++-----
debian/kde-config-screenlocker.install | 3 ++
4 files changed, 78 insertions(+), 32 deletions(-)
diff --cc debian/copyright
index b39434f,c8d1bc1..6c70e40
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,16 -1,52 +1,53 @@@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: kscreenlocker
+Source: <https://projects.kde.org/projects/kde/workspace/kscreenlocker>
Files: *
- debian/*
- Copyright: 1999 Martin R. Jones <mjones at kde.org>
- 2002 Luboš Luňák <l.lunak at kde.org>
- 2003 Oswald Buddenhagen <ossi at kde.org>
- 2008 Chani Armitage <chanika at gmail.com>
- 2011 Martin Gräßlin <mgraesslin at kde.org>
- 2015 Bhusahan Shah <bhush94 at gmail.com>
- 2015 Rohan Garg <rohan at kde.org>
+ 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.
+ .
+ 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'.
+
+ Files: debian/*
+ 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
--
kscreenlocker packaging
More information about the pkg-kde-commits
mailing list