[SCM] networkmanager-qt packaging branch, master, updated. cfadfca8b95b9fd3c8aed3d148554cef24bd89e4

Tue Feb 24 17:14:45 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=dea1320

The following commit has been merged in the master branch:
commit dea132062a41012213bb7fc7d7d177bce482c1b7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jan 24 17:42:48 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 81 +++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea0db5d..db3104c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,6 @@ networkmanager-qt (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 17:14:43 +0100
diff --git a/debian/copyright b/debian/copyright
index 6603013..17103f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,14 @@ Upstream-Name: networkmanager-qt
 Source: git://anongit.kde.org/networkmanager-qt
 
 Files: *
-Copyright: 2012-2014 Grulich <jgrulich at redhat.com>
-           2007-2011 Will Stephenson <wstephenson at kde.org>
-           2013 Daniel Nicoletti <dantti12 at gmail.com>
-           2011-2013 Lamarque V. Souza <lamarque at kde.org>
-           2011 Ilia Kats <ilia-kats at gmx.net>
-           2013-2014 Lukáš Tinkl <ltinkl at redhat.com>
-           2011-2013 Lamarque Souza <lamarque at kde.org>
-           2006 Alexander Neundorf <neundorf at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: LGPL-KDEeV
+Copyright: 2006 Alexander Neundorf <neundorf at kde.org>
+           2013, Daniel Nicoletti <dantti12 at gmail.com>
+           2011, Ilia Kats <ilia-kats at gmx.net>
+           2012-2014, Jan Grulich <jgrulich at redhat.com>
+           2011-2013, Lamarque V. Souza <lamarque at kde.org>
+           2013-2014, Lukáš Tinkl <ltinkl at redhat.com>
+           2008-2011, 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
@@ -29,12 +27,14 @@ 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/GPL-2.1".
+ 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: examples/main.cpp
-Copyright: 2011-2013 Lamarque V. Souza <lamarque at kde.org>
-License: GPL-KDEeV
+Copyright: 2011-2013, Lamarque V. Souza <lamarque 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
@@ -51,5 +51,54 @@ License: GPL-KDEeV
  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".
+ 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: cmake/FindNetworkManager.cmake
+Copyright: 2006, Alexander Neundorf <neundorf 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.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, 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 Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
networkmanager-qt packaging

