[SCM] kimageformats packaging branch, master, updated. 5c589fd000da2d487a7ea7d9f2a2c4937d015b0c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c3bc10e07a0592aae5ffeaab3d039339b01ae4ff
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 2 23:53:28 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22cfc47..6ba3f2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kimageformats (5.7.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.7.0).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:36:17 +0100
 
diff --git a/debian/copyright b/debian/copyright
index c7350a3..c61ea29 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,33 @@ Source: https://projects.kde.org/projects/frameworks/kimageformats
 
 Files: *
 Copyright: 2014, Alex Merry <alex.merry at kde.org>
-           2003, Brad Hards <bradh at frogmouth.net>
            2005, Christoph Hormann <chris_hormann at gmx.de>
-           1998, Dirk Schoenberger <dirk.schoenberger at freenet.de>
            2003, Dominik Seichter <domseichter at web.de>
            1998, Halfdan Ingvarsson
            2003-2004, Ignacio Castaño <castano at ludicon.com>
            2005, Ignacio Castaño <castanyo at yahoo.es>
            2004, Melchior FRANZ <mfranz at kde.org>
-           2002, Michael Ritzert <michael at ritzert.de>
            2002-2005, Nadeem Hasan <nhasan at kde.org>
            2007, Ruben Lopez <r.lopez at bren.es>
            2010, Troy Unrau <troy at kde.org>
 License: LGPL-2+
 
+Files: src/imageformats/eps.cpp
+       src/imageformats/eps_p.h
+       src/imageformats/exr.cpp
+       src/imageformats/exr_p.h
+       src/imageformats/jp2.cpp
+       src/imageformats/jp2_p.h
+Copyright: 2013, Alex Merry <alex.merry at kdemail.net>
+           2003, Brad Hards <bradh at frogmouth.net>
+           1998, Dirk Schoenberger <dirk.schoenberger at freenet.de>
+           2002, Michael Ritzert <michael at ritzert.de>
+License: LGPL
+ This library is distributed under the conditions of the GNU LGPL.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in "/usr/share/common-licenses/LGPL".
+
 Files: autotests/pictest.cpp
        autotests/readtest.cpp
        autotests/writetest.cpp
@@ -45,15 +58,22 @@ License: LGPL-2.1+3+KDEeV
  <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General Public License
- version 2 can be found in "/usr/share/common-licenses/LGPL-2", likewise, the
- complete text of the GNU Lesser General Public License version 3 can be found
- in "/usr/share/common-licenses/LGPL-3".
+ 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: src/imageformats/xcf.cpp
+Files: autotests/read/eps/bw.eps
+       autotests/read/eps/rgb.eps
+       autotests/write/bw.eps
+       autotests/write/rgb.eps
+       COPYING.LIB
+       src/imageformats/xcf.cpp
        src/imageformats/xcf_p.h
        src/imageformats/gimp_p.h
-Copyright: 2001 lignum Computing, Inc. <allen at lignumcomputing.com>
+Copyright: 1991-1999, Free Software Foundation, Inc
+           2001 lignum Computing, Inc. <allen at lignumcomputing.com>
            2004 Melchior FRANZ <mfranz at kde.org>
+           1996-2011, Glyph & Cog, LLC
 License: LGPL-2.1+
  This plug-in is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -101,6 +121,7 @@ License: BSD-3-clause
 Files: debian/*
 Copyright: 2014, Jonathan Riddell <jriddell at ubuntu.com>
 License: LGPL-2+
+
 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

-- 
kimageformats packaging