[SCM] solid packaging branch, master, updated. b6119720c680b493eeee220792da4b14b853bd10
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 17:14:53 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=ecbe832
The following commit has been merged in the master branch:
commit ecbe832ad07faa1b9e0f76658515940d9485c0f0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Jan 24 18:35:33 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 120 ++++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0771b03..fa585e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ solid (5.6.0-1~) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.6, no changes needed.
* Update install files.
* Update build dependencies to follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Sat, 24 Jan 2015 18:04:27 +0100
diff --git a/debian/copyright b/debian/copyright
index e0f1699..f0940d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,18 +3,28 @@ Upstream-Name: solid
Source: https://projects.kde.org/projects/frameworks/solid
Files: *
- debian/*
-Copyright: 2007 Will Stephenson <wstephenson at kde.org>,
- 2013 Ivan Cukic <ivan.cukic at kde.org>,
- 2007 Kevin Ottens <ervin at kde.org>,
- 2006 Davide Bettio <davide.bettio at kdemail.net>,
- 2009 Harald Fernengel <harry at kdevelop.org>,
- 2012 Lukas Tinkl <ltinkl at redhat.com>,
- 2010 Paulo Romulo Alves Barros <paulo.romulo at kdemail.net>,
- 2009 Benjamin K. Stuhl <bks24 at cornell.edu>,
- 2010 Alex Fiestas <alex at eyeos.org>
- 2014 Jonathan Riddell <jriddell at ubuntu.com>
-License: LGPL-2.1+
+Copyright: 2014, Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2010, Alex Merry <alex.merry at kdemail.net>
+ 2010, Alex Fiestas <alex at eyeos.org>
+ 2009, Benjamin K. Stuhl <bks24 at cornell.edu>
+ 2012, Dan Vrátil <dvratil at redhat.com>
+ 2006, Davide Bettio <davide.bettio at kdemail.net>
+ 2009, Harald Fernengel <harry at kdevelop.org>
+ 2013, Ivan Cukic <ivan.cukic at kde.org>
+ 2007, Jeff Mitchell <kde-dev at emailgoeshere.com>
+ 2014, Kai Uwe Broulik <kde at privat.broulik.de>
+ 2005-2010, Kevin Ottens <ervin at kde.org>
+ 2009-2014, Lukáš Tinkl <ltinkl at redhat.com>
+ 2010-2011, Mario Bensi <mbensi at ipsquad.net>
+ 2010, Michael Zanetti <mzanetti at kde.org>
+ 2006, Michaël Larouche <michael.larouche at kdemail.net>
+ 2013, Patrick Spendrin <ps_ml at gmx.de>
+ 2013-2014, Patrick von Reth <vonreth at kde.org>
+ 2010, Paulo Romulo Alves Barros <paulo.romulo at kdemail.net>
+ 2009-2010, Pino Toscano <pino at kde.org>
+ 2010, Rafael Fernández López <ereslibre at kde.org>
+ 2007, Will Stephenson <wstephenson at kde.org>
+License: LGPL-2.1+3+KDEeV
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -31,6 +41,86 @@ License: LGPL-2.1+
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2.1".
-Comment: or any later version accepted by the membership of KDE e.V.
+ On Debian systems, 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: src/imports/devices.cpp
+ src/imports/devices.h
+ src/imports/devices_p.h
+ src/imports/solidextensionplugin.cpp
+ src/imports/solidextensionplugin.h
+Copyright: 2013, Ivan Cukic <ivan.cukic(at)kde.org>
+License: LGPL-2.1+
+
+Files: src/tools/solid-hardware/solid-hardware.cpp
+ src/tools/solid-hardware/solid-hardware.h
+Copyright: 2014, Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2006, Kevin Ottens <ervin at kde.org>
+License: LGPL-2
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+Files: cmake/FindIOKit.cmake
+ cmake/FindUDev.cmake
+Copyright: 2009, Harald Fernengel <harry at kdevelop.org>
+ 2010, Rafael Fernández López <ereslibre at kde.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
+License: LGPL-2.1+
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
--
solid packaging
More information about the pkg-kde-commits
mailing list