[SCM] signond packaging branch, master, updated. e1418fc103e4fbba0512f3851549658ad1003074

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/signond.git;a=commitdiff;h=b6b2ea9

The following commit has been merged in the master branch:
commit b6b2ea9bcb6cd77addbb0629e48924cdc7b512a2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 24 15:17:09 2015 +0200

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1e2a7a..d879814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 signond (8.57+20150423-1~) UNRELEASED; urgency=medium
 
   * Prepare Debian release. (8.57+20150423)
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 24 Apr 2015 14:37:25 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f9d9a44..7064199 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,55 @@ Upstream-Contact: Alberto Mardegan <alberto.mardegan at canonical.com>
 Source: https://gitlab.com/accounts-sso/signond.git
 
 Files: *
-Copyright: 2009-2011 Nokia Corporation
-           2011 Intel Corporation
-           2012 Canonical Ltd
+Copyright: 2013, Canonical Ltd
+           2011, Intel Corporation
+           2009-2010, Nokia Corporation
 License: LGPL-2.1
 
+Files: src/remotepluginprocess/my-network-proxy-factory.cpp
+Copyright: 2012, Nokia Corporation and/or its subsidiary(-ies)
+License: GPL-3 or LGPL-2.1-QTexception-1.1
+ $QT_BEGIN_LICENSE:LGPL$
+ GNU Lesser General Public License Usage
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL included in the packaging of this
+ file. Please review the following information to ensure the GNU Lesser
+ General Public License version 2.1 requirements will be met:
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Nokia gives you certain additional
+ rights. These rights are described in the Nokia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU General
+ Public License version 3.0 as published by the Free Software Foundation
+ and appearing in the file LICENSE.GPL included in the packaging of this
+ file. Please review the following information to ensure the GNU General
+ Public License version 3.0 requirements will be met:
+ http://www.gnu.org/copyleft/gpl.html.
+ .
+ Other Usage
+ Alternatively, this file may be used in accordance with the terms and
+ conditions contained in a signed written agreement between you and Nokia.
+ .
+ .
+ .
+ .
+ .
+ .
+ $QT_END_LICENSE$
+
+Files: COPYING
+Copyright: 1991-1999, Free Software Foundation, Inc
+License: LGPL-2.1+
+
 Files: debian/*
 Copyright: 2011-2013 Ken VanDine <ken.vandine at canonical.com>
 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
  the Free Software Foundation; either version 2 of the License, or
@@ -29,5 +70,37 @@ License: GPL-2+
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 License: LGPL-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'.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ version 2.1 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
+ 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 St, 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'.
+
+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'.

-- 
signond packaging