[SCM] plasma-nm packaging branch, master, updated. 4f27d5c886ac71e16e822d94ea063a7be2c634b9
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Feb 14 08:39:30 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-nm.git;a=commitdiff;h=efa3e60
The following commit has been merged in the master branch:
commit efa3e60cc7c513522de21ebc1276091a2ffc5600
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Feb 13 13:41:56 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 281 +++++++++++++++++++++++++++++++++----------------------
2 files changed, 171 insertions(+), 111 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcf6c5e..291248a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ plasma-nm (4:5.2.0-1~) UNRELEASED; urgency=medium
* Add myself as Uploader.
* Update build dependencies to build against experimental and to
follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Fri, 13 Feb 2015 12:58:37 +0100
diff --git a/debian/copyright b/debian/copyright
index 625b666..6c0fb3d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,18 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: plasma-nm
-Source: ftp://ftp.kde.org/pub/kde/unstable/plasma/plasma-nm
+Source: git://anongit.kde.org/plasma-nm
Files: *
-Copyright: © 2013-2014 Lukas Tinkl <ltinkl at redhat.com>
- © 2013-2014 Grulich <jgrulich at redhat.com>
- © 2011 Ilia Kats <ilia-kats at gmx.net> <ilia-kats at gmx.de>
- © 2007-2009 Will Stephenson <wstephenson at kde.org>
- © 2010-2012 Lamarque Souza <lamarque at kde.org>
- © 2005-2012 Red Hat Inc.
- © 2010-2013 Lamarque V. Souza <lamarque at kde.org>
- © 2013 Daniel Nicoletti <dantti12 at gmail.com>
- © 2008-2010 Sebastian Kügler <sebas at kde.org>
- © 2010 Maurus Rohrer <maurus.rohrer at gmail.com>
- © 2009, 2011 Paul Marchouk <pmarchouk at gmail.com>
- © 2007-2008 Novell Inc.
- © 2005-2008 Dan Williams <dcbw at redhat.com>
- © 2011-2012 Rajeesh K Nambiar <rajeeshknambiar at gmail.com>
- © 2009 Dario Freddi <drf54321 at gmail.com>
- © 2007 David Faure <faure at kde.org>
- © 2006 Alexander Neundorf <neundorf at kde.org>
- © 2005-2008 Tim Niemueller <tim at niemueller.de>
- © 2010 Andrey Borzenkov <arvidjaar at gmail.com>
- © 2009 Pavel Andreev <apavelm at gmail.com>
- © 2008-2009 Intel Corporation.
-License: LGPL-KDEeV
+Copyright: 2013, Daniel Nicoletti <dantti12 at gmail.com>
+ 2011, Ilia Kats <ilia-kats at gmx.de>
+ 2011, Ilia Kats <ilia-kats at gmx.net>
+ 2013-2014, Jan Grulich <jgrulich at redhat.com>
+ 2010-2013, Lamarque V. Souza <lamarque at kde.org>
+ 2013-2014, Lukas Tinkl <ltinkl at redhat.com>
+ 2010, Sebastian Kügler <sebas at kde.org>
+ 2008-2009, Will Stephenson <wstephenson at kde.org>
+ 2014, Xuetian Weng <wengxt at gmail.com>
+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
@@ -40,77 +28,165 @@ License: LGPL-KDEeV
.
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", likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in "/usr/share/common-licenses/LGPL-3".
-Files: editor/* excluding:
- -? editor/CMakeLists.txt
- kded/* excluding:
- -? kded/CMakeLists.txt
- -+ kded/pindialog.cpp
- -+ kded/pindialog.h
- -+ kded/service.cpp
- -+ kded/service.h
- libs/debug.cpp
- libs/debug.h
- libs/handler.cpp
- libs/handler.h
- libs/declarative/* excluding:
- -? libs/declarative/CMakeLists.txt
- libs/editor/connectiondetaileditor.cpp
- libs/editor/connectiondetaileditor.h
- libs/editor/vpnuiplugin.cpp
- libs/editor/vpnuiplugin.h
- libs/editor/settings/*
- libs/editor/widgets/advancedpermissionswidget.cpp
- libs/editor/widgets/advancedpermissionswidget.h
- libs/editor/widgets/bssidcombobox.cpp
- libs/editor/widgets/bssidcombobox.h
- libs/editor/widgets/hwaddrcombobox.cpp
- libs/editor/widgets/hwaddrcombobox.h
- libs/editor/widgets/settingwidget.cpp
- libs/editor/widgets/settingwidget.h
- libs/editor/widgets/ssidcombobox.cpp
- libs/editor/widgets/ssidcombobox.h
- libs/models/*
- vpn/l2tp/* excluding:
- -? vpn/l2tp/CMakeLists.txt
- -+ vpn/l2tp/nm-l2tp-service.h
- vpn/openconnect/* excluding:
- -? vpn/openconnect/CMakeLists.txt
- -? vpn/openconnect/FindOpenConnect.cmake
- -+ vpn/openconnect/nm-openconnect-service.h
- vpn/openswan/* excluding:
- -? vpn/openswan/CMakeLists.txt
- -+ vpn/openswan/nm-openswan-service.h
- vpn/openvpn/openvpnadvancedwidget.cpp
- vpn/openvpn/openvpnadvancedwidget.h
- vpn/vpnc/vpncadvancedwidget.cpp
- vpn/vpnc/vpncadvancedwidget.h
- vpn/vpnc/vpncwidget.cpp
- vpn/vpnc/vpncwidget.h
-Copyright: 2013 Jan Grulich <jgrulich at redhat.com>
- 2009 Will Stephenson <wstephenson at kde.org>
- 2013 by Daniel Nicoletti <dantti12 at gmail.com>
- 2013 Lukas Tinkl <ltinkl at redhat.com>
- 2013 Jan Grulich <jgrulich at redhat.com>
-License: LGPL-2.1-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
- version 2.1 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 6 of version 3 of the license.
+Files: kded/pindialog.cpp
+ kded/pindialog.h
+ kded/service.cpp
+ kded/service.h
+ libs/editor/mobileproviders.cpp
+ libs/editor/mobileproviders.h
+ libs/editor/simpleipv4addressvalidator.cpp
+ libs/editor/simpleipv4addressvalidator.h
+ libs/editor/simpleipv6addressvalidator.cpp
+ libs/editor/simpleipv6addressvalidator.h
+ libs/editor/widgets/delegate.cpp
+ libs/editor/widgets/delegate.h
+ libs/editor/widgets/intdelegate.cpp
+ libs/editor/widgets/intdelegate.h
+ libs/editor/widgets/ipv4delegate.cpp
+ libs/editor/widgets/ipv4delegate.h
+ libs/editor/widgets/ipv4routeswidget.cpp
+ libs/editor/widgets/ipv4routeswidget.h
+ libs/editor/widgets/ipv6delegate.cpp
+ libs/editor/widgets/ipv6delegate.h
+ libs/editor/widgets/ipv6routeswidget.cpp
+ libs/editor/widgets/ipv6routeswidget.h
+ libs/editor/widgets/mobileconnectionwizard.cpp
+ libs/editor/widgets/mobileconnectionwizard.h
+ libs/uiutils.cpp
+ libs/uiutils.h
+ vpn/openvpn/openvpn.cpp
+ vpn/openvpn/openvpn.h
+ vpn/openvpn/openvpnauth.cpp
+ vpn/openvpn/openvpnauth.h
+ vpn/openvpn/openvpnwidget.cpp
+ vpn/openvpn/openvpnwidget.h
+ vpn/pptp/pptp.cpp
+ vpn/pptp/pptp.h
+ vpn/pptp/pptpauth.cpp
+ vpn/pptp/pptpauth.h
+ vpn/pptp/pptpwidget.cpp
+ vpn/pptp/pptpwidget.h
+ vpn/strongswan/strongswan.cpp
+ vpn/strongswan/strongswan.h
+ vpn/strongswan/strongswanauth.cpp
+ vpn/strongswan/strongswanauth.h
+ vpn/strongswan/strongswanwidget.cpp
+ vpn/strongswan/strongswanwidget.h
+ vpn/vpnc/vpnc.cpp
+ vpn/vpnc/vpnc.h
+ vpn/vpnc/vpncauth.cpp
+ vpn/vpnc/vpncauth.h
+Copyright: 2010, Andrey Borzenkov <arvidjaar at gmail.com>
+ 2009, Dario Freddi <drf54321 at gmail.com>
+ 2011, Ilia Kats <ilia-kats at gmx.net>
+ 2013-2014, Jan Grulich <jgrulich at redhat.com>
+ 2010-2014, Lamarque V. Souza <lamarque at kde.org>
+ 2013, Lukas Tinkl <ltinkl at redhat.com>
+ 2010, Maurus Rohrer <maurus.rohrer at gmail.com>
+ 2009-2011, Ilia Kats <ilia-kats at gmx.net>, based on work by Paul Marchouk <pmarchouk at gmail.com>
+ 2009, Pavel Andreev <apavelm at gmail.com>
+ 2011-2012, Rajeesh K Nambiar <rajeeshknambiar at gmail.com>
+ 2008-2010, Sebastian Kügler <sebas at kde.org>
+ 2008-2009, Will Stephenson <wstephenson at kde.org>
+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 library is distributed in the hope that it will be useful,
+ 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
- Lesser General Public License for more details.
+ 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 Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ 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: COPYING
+ vpn/l2tp/nm-l2tp-service.h
+ vpn/openconnect/nm-openconnect-service.h
+ vpn/openswan/nm-openswan-service.h
+ vpn/openvpn/nm-openvpn-service.h
+ vpn/pptp/nm-pptp-service.h
+ vpn/strongswan/nm-strongswan-service.h
+ vpn/vpnc/nm-vpnc-service.h
+Copyright: 2005-2008, Dan Williams <dcbw at redhat.com>
+ 1989-1991, Free Software Foundation, Inc
+ 2008-2009, Intel Corporation. //krazy:exclude=copyright
+ 2007-2008, Novell, Inc
+ 2007-2008, Novell, Inc. //krazy:exclude=copyright
+ 2008, Red Hat, Inc
+ 2008, Red Hat, Inc. //krazy:exclude=copyright
+ 2005-2008, Tim Niemueller <tim at niemueller.de>
+License: GPL-2+
+ 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) any later version.
+ .
+ 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, 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 General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: cmake/FindMobileBroadbandProviderInfo.cmake
+ cmake/FindModemManager.cmake
+ cmake/FindNetworkManager.cmake
+ vpn/openconnect/FindOpenConnect.cmake
+Copyright: 2006, Alexander Neundorf <neundorf at kde.org>
+ 2011, Ilia Kats <ilia-kats at gmx.net>
+ 2015, Jan Grulich <jgrulich at redhat.com>
+ 2011, Lamarque Souza <lamarque at kde.org>
+ 2007, Will Stephenson <wstephenson 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, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
-Files: libs/plasmanm_export.h
-Copyright: 2007 David Faure <faure 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
@@ -122,26 +198,9 @@ License: LGPL-2+
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.
-
-Files: debian/*
-Copyright: 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: GPL-2.0+
- 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
- (at your option) any later version.
- .
- This package 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/>
+ You should have received a copy of the GNU Library General Public
+ License along with this library; 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 General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ 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".
--
plasma-nm packaging
More information about the pkg-kde-commits
mailing list