[SCM] kdoctools packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g67cafe2

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit da6e407d2fc8125c6c1267e282410788acf0dfc2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jul 15 15:23:05 2014 +0200

    Update copyright information.
---
 debian/copyright | 48 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1348e52..5c3b7cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Source: https://projects.kde.org/projects/frameworks/kdoctools
 
 Files: *
        debian/*
-Copyright: © 2010 Luigi Toscano <luigi.toscano at tiscali.it>
-           © 2007 Matthias Kretz <kretz at kde.org>
-           © 2006-2007 Laurent Montel <montel at kde.org>
-           © 2006-2009 Alexander Neundorf <neundorf at kde.org>
-           2014 Scarlett Clark <sgclark at kubuntu.org>
-License: MIT
+Copyright: 2006-2009, Alexander Neundorf <neundorf at kde.org>
+           2006-2007, Laurent Montel <montel at kde.org>
+           2010, Luigi Toscano <luigi.toscano at tiscali.it>
+           2007, Matthias Kretz <kretz at kde.org>
+           2014, Scarlett Clark <sgclark at kubuntu.org>
+License: Expat
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
  files (the "Software"), to deal in the Software without
@@ -31,9 +31,37 @@ License: MIT
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
 
+Files: cmake/*
+Copyright: 2010-2014, Luigi Toscano <luigi.toscano at tiscali.it>
+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 above copyright notice, this
+    list of conditions and the following disclaimer.
+ .
+ 2) Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+ 3) Neither the name of the ORGANIZATION nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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: src/docbookl10nhelper.cpp
-Copyright: 2010 Luigi Toscano <luigi.toscano at tiscali.it>
-License: LGPL-2.1+ accepted by the membership of KDE e.V.
+Copyright: 2010, Luigi Toscano <luigi.toscano at tiscali.it>
+License: LGPL-2.1 or LGPL-3 or later accepted by KDE e.V.
  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
@@ -52,5 +80,5 @@ License: LGPL-2.1+ accepted by the membership of KDE e.V.
  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".
+ 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".

-- 
kdoctools packaging