[SCM] kdeconnect packaging branch, master, updated. upstream/0.8-63-g359e3e4
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Feb 5 03:53:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=359e3e4
The following commit has been merged in the master branch:
commit 359e3e49da699c6e85bfac91a7f47cb48912d88e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Feb 5 00:53:02 2016 -0300
Update and simplify debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 163 ++++++++++++++++++++++++++++---------------------------
2 files changed, 84 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 488f9f4..2eb1199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ kdeconnect (0.9g-1) UNRELEASED; urgency=medium
run fine with network access but fail without it (and thus on sbuild).
* Add libqca-qt5-2-plugins as a build dependency, it is needed by the tests.
* Update lintian overrides.
+ * Update and simplify debian/copyright.
-- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Mon, 01 Feb 2016 17:49:26 -0300
diff --git a/debian/copyright b/debian/copyright
index 690a07b..de8cc57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,101 +3,87 @@ Upstream-Name: kdeconnect-kde
Source: https://projects.kde.org/projects/playground/base/kdeconnect-kde
Files: *
-Copyright: 2014, Albert Vaca Cintora <albervaka at gmail.com>
-License: GPL-2+
-
-Files: core/backends/lan/socketlinereader.cpp
-Copyright: 2014, Alejandro Fiestas Olivares <afiestas at kde.org>
-License: GPL-2+
-
-Files: tests/testsocketlinereader.cpp
-Copyright: 2014, Alejandro Fiestas Olivares <afiestas at kde.org>
+Copyright: 2014 Albert Vaca Cintora <albervaka at gmail.com>
+ 2014 Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2013 Aleix Pol Gonzalez <aleixpol at kde.org>
+ 2014 Samoilenko Yuri <kinnalru at gmail.com>
+ 2013 Rosetta Contributors and Canonical Ltd
+ 2014 Ahmed I. Khalil <ahmedibrahimkhali at gmail.com>
+ 2014 Pramod Dematagoda <pmdematagoda at mykolab.ch>
+ 2015 Martin Gräßlin <mgraesslin at kde.org>
+License: GPL-KDEeV
+
+Files: app/main.cpp
+ tests/testsocketlinereader.cpp
+ tests/downloadjobtest.cpp
+Copyright: 2014 Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2013 Aleix Pol Gonzalez <aleixpol at kde.org>
+ 2014 Albert Vaca Cintora <albertvaka at gmail.com>
License: LGPL-2.1+
-Files: cli/kdeconnect-cli.cpp
-Copyright: 2013, Aleix Pol Gonzalez <aleixpol at kde.org>
-License: GPL-2+
-
-Files: kded/kded.cpp
- kded/kded.h
- kded/kdeconnectd.cpp
- plugins/sftp/*
-Copyright: 2014, Samoilenko Yuri <kinnalru at gmail.com>
-License: GPL-2+
-
-Files: interfaces/modeltest.h interfaces/modeltest.cpp
+Files: interfaces/modeltest.h
+ interfaces/modeltest.cpp
Copyright: 2007, Trolltech ASA. All rights reserved
License: GPL-2
Files: po/*.po
-Copyright: 2013-2015, André Marcelo Alvarenga <alvarenga at kde.org>
- 2013-2014, Balázs Úr <urbalazs at gmail.com>
- 2013-2014, Burkhard Lück <lueck at hube-lueck.de>
- 2013-2015, Eloy Cuadra <ecuadra at eloihr.net>
- 2013-2015, Freek de Kruijf <freekdekruijf at kde.nl>
- 2013, Joëlle Cornavin <jcorn at free.fr>
- 2014, Jose Antonio Moray Serrano <moray33 at gmx.com>
- 2013, Julia Dronova <juliette.tux at gmail.com>
- 2013-2015, Lasse Liehu <lasse.liehu at gmail.com>
- 2014, Liudas Ališauskas <liudas at aksioma.lt>
- 2014-2015, Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
- 2013, Marce Villarino <mvillarino at kde-espana.org>
- 2013-2015, Martin Schlander <mschlander at opensuse.org>
- 2013, Mauro Panzeri <damonhill82 at gmail.com>
- 2014, Nicolas Ménard <nico.menard at gmail.com>
- 2014-2015, Park Shinjo <peremen at gmail.com>
- 2013-2015, Roman Paholik <wizzardsk at gmail.com>
- 2014, Sebastien Renard <renard at kde.org>
- 2013-2014, Sergiu Bivol <sergiu at ase.md>
- 2013-2015, Stefan Asserhäll <stefan.asserhall at bredband.net>
- 2013-2014, Tommi Nieminen <translator at legisign.org>
- 2013, Vincent PINON <vincent.pinon at st.com>
- 2013-2015, Vít Pelčák <vit at pelcak.org>
- 2014, Volkan Gezer <volkangezer at gmail.com>
- 2013-2014, Yuri Chornoivan <yurchor at ukr.net>
- 2014, Samir Ribić <megaribi at epn.ba>
- 2014, Antoni Bella Pérez <antonibella5 at yahoo.com>
- 2014, Nermina Ahmić <nahmic1 at etf.unsa.ba>
- 2014, Svetoslav Stefanov <svetlisashkov at yahoo.com>
- 2014, Victor Rodrigo Cordoba <vrcordoba at gmail.com>
- 2014, José Nuno Coelho Pires <zepires at gmail.com>
- 2015, Safa Alfulaij <safa1996alfulaij at gmail.com>
- 2014, Frederik Schwarzer <schwarzer at kde.org>
- 2014, Maxime Corteel <mcorteel at gmail.com>
- 2014, Vincenzo Reale <smart2128 at baslug.org>
- 2014, Aracele Torres <aracele at kde.org>
-License: GPL-2+
-
-Files: po/lt/plasma_applet_kdeconnect.po
- po/lt/kdeconnect-kded.po
-Copyright: 2013, Albert Vaca Cintora <albervaka at gmail.com>
-License: GPL-2+
-
-Files: po/bs/kdeconnect-kded.po
- po/bs/kdeconnect-kcm.po
-Copyright: 2013, Rosetta Contributors and Canonical Ltd
-License: GPL-2
-
-Files: plugins/mousepad/*
-Copyright: 2014, Ahmed I. Khalil <ahmedibrahimkhali at gmail.com>
-License: GPL-2+
-
-Files: plugins/screensaver-inhibit/*
-Copyright: 2014 Pramod Dematagoda <pmdematagoda at mykolab.ch>
+ fileitemactionplugin/sendfileitemaction.*
+ plasmoid/declarativeplugin/processrunner.*
+Copyright: 2013-2015 André Marcelo Alvarenga <alvarenga at kde.org>
+ 2013-2014 Balázs Úr <urbalazs at gmail.com>
+ 2013-2014 Burkhard Lück <lueck at hube-lueck.de>
+ 2013-2015 Eloy Cuadra <ecuadra at eloihr.net>
+ 2013-2015 Freek de Kruijf <freekdekruijf at kde.nl>
+ 2013 Joëlle Cornavin <jcorn at free.fr>
+ 2014 Jose Antonio Moray Serrano <moray33 at gmx.com>
+ 2013 Julia Dronova <juliette.tux at gmail.com>
+ 2013-2015 Lasse Liehu <lasse.liehu at gmail.com>
+ 2014 Liudas Ališauskas <liudas at aksioma.lt>
+ 2014-2015 Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
+ 2013 Marce Villarino <mvillarino at kde-espana.org>
+ 2013-2015 Martin Schlander <mschlander at opensuse.org>
+ 2013 Mauro Panzeri <damonhill82 at gmail.com>
+ 2014 Nicolas Ménard <nico.menard at gmail.com>
+ 2014-2015 Park Shinjo <peremen at gmail.com>
+ 2013-2015 Roman Paholik <wizzardsk at gmail.com>
+ 2014 Sebastien Renard <renard at kde.org>
+ 2013-2014 Sergiu Bivol <sergiu at ase.md>
+ 2013-2015 Stefan Asserhäll <stefan.asserhall at bredband.net>
+ 2013-2014 Tommi Nieminen <translator at legisign.org>
+ 2013 Vincent PINON <vincent.pinon at st.com>
+ 2013-2015 Vít Pelčák <vit at pelcak.org>
+ 2014 Volkan Gezer <volkangezer at gmail.com>
+ 2013-2014 Yuri Chornoivan <yurchor at ukr.net>
+ 2014 Samir Ribić <megaribi at epn.ba>
+ 2014 Antoni Bella Pérez <antonibella5 at yahoo.com>
+ 2014 Nermina Ahmić <nahmic1 at etf.unsa.ba>
+ 2014 Svetoslav Stefanov <svetlisashkov at yahoo.com>
+ 2014 Victor Rodrigo Cordoba <vrcordoba at gmail.com>
+ 2014 José Nuno Coelho Pires <zepires at gmail.com>
+ 2015 Safa Alfulaij <safa1996alfulaij at gmail.com>
+ 2014 Frederik Schwarzer <schwarzer at kde.org>
+ 2014 Maxime Corteel <mcorteel at gmail.com>
+ 2014 Vincenzo Reale <smart2128 at baslug.org>
+ 2014 Aracele Torres <aracele at kde.org>
+ 2011 Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2014 Aleix Pol Gonzalez <aleixpol at kde.org>
+ 2013 Eike Hein <hein at kde.org>
License: GPL-2+
Files: interfaces/KDEConnectConfig.cmake.in
-Copyright: 2014, Alexandr Akulich <akulichalexander at gmail.com>
+ cmake/FindLibFakeKey.cmake
+Copyright: 2014 Alexandr Akulich <akulichalexander at gmail.com>
+ 2014 Christophe Giboudeaux <cgiboudeaux at gmx.com>
License: BSD-3-clause
Files: cmake/FindXTest.cmake
-Copyright: 2011, O.S. Systems Software Ltda.
- 2011, Otavio Salvador <otavio at ossystems.com.br>
- 2011, Marc-Andre Moreau <marcandre.moreau at gmail.com>
+Copyright: 2011 O.S. Systems Software Ltda.
+ 2011 Otavio Salvador <otavio at ossystems.com.br>
+ 2011 Marc-Andre Moreau <marcandre.moreau at gmail.com>
License: Apache-2.0
Files: debian/*
-Copyright: 2014, David Suárez <david.sephirot at gmail.com>
+Copyright: 2014 David Suárez <david.sephirot at gmail.com>
License: GPL-2+
License: GPL-2+
@@ -196,3 +182,20 @@ License: Apache-2.0
.
On Debian systems, the full text of the Apache License version 2.0 can be
found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+License: GPL-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/>.
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list