[SCM] ki18n packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g40469d4

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 399be22064188061e509ed6f780150948ee6c8f0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 10:57:31 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 59 ++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7b2d26..0fb4efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ki18n (5.6.0-1~) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update install files.
   * Remove kjs build dependency, keep ki18n in tier 1.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 09:47:28 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 6d5a0b2..1e21668 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,14 @@ Source: https://projects.kde.org/projects/frameworks/ki18n
 
 Files: *
        debian/*
-Copyright: © 2006-2008, 2012-2013 Chusslove Illich <caslav.ilic at gmx.net>
+Copyright: 2006-2013, Chusslove Illich <caslav.ilic at gmx.net>
+           1995-2006, Free Software Foundation, Inc
            © 2006 Alexander Neundorf <neundorf at kde.org>
            © 2013 Aurélien Gâteau <agateau at kde.org>
-           © 2001 Hans Petter Bieker <bieker at kde.org>
-           © 1995-1998, 2000-2002, 2004-2006 Free Software Foundation Inc.
+           2001 Hans Petter Bieker <bieker at kde.org>
+           2014, Kevin Krammer <krammer at kde.org>
            © 2005 Thomas Braxton <brax108 at cox.net>
-             2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 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
@@ -30,10 +31,46 @@ License: LGPL-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".
 
-Files: autotests/ktranscripttest.cpp
+Files: cmake/*
+Copyright: 2014, Alex Richardson <arichardson.kde at gmail.com>
+           2006-2007, Alexander Neundorf <neundorf at kde.org>
+           2007-2009, Kitware, Inc
+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 University 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 REGENTS 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 REGENTS 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: autotests/ktranscriptcleantest.cpp
+       autotests/ktranscriptcleantest.h
+       autotests/ktranscripttest.cpp
        autotests/ktranscripttest.h
-Copyright: 2013 Aurélien Gâteau <agateau at kde.org>
-License: LGPL-2.1+ accepted by the membership of KDE e.V.
+       src/klocalizedtranslator.cpp
+       src/klocalizedtranslator.h
+Copyright: 2013, Aurélien Gâteau <agateau at kde.org>
+           2014, Chusslove Illich <caslav.ilic at gmx.net>
+           2014, Kevin Krammer <krammer at kde.org>
+           2014, Martin Gräßlin <mgraesslin 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
@@ -52,11 +89,13 @@ 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", likewise,
+ the version 3 of the GNU Lesser General Public License can be found in
+ "/usr/share/common-licenses/LGPL-3".
 
 Files: autotests/klocalizedstringtest.h
-Copyright: 2005 Thomas Braxton <brax108 at cox.net>
+Copyright: 2005, Thomas Braxton <brax108 at cox.net>
 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

-- 
ki18n packaging