[SCM] kimageformats packaging branch, master, updated. debian/5.22.0-2-5-gc2c3c7c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c2c3c7c62e5e4312a62babd95d7d5a0e362839ea
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jun 9 11:14:47 2016 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 28 ----------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0c4377..01d2823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kimageformats (5.22.0-3) UNRELEASED; urgency=medium
     directory as install place.
     - remove kimageformat-plugins.install, no more used now
   * Shorten the short description.
+  * Update copyright.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Jun 2016 11:00:34 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c61ea29..a6cd165 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,8 +19,6 @@ 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>
@@ -92,32 +90,6 @@ License: LGPL-2.1+
  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.1".
 
-Files: cmake/FindOpenEXR.cmake
-Copyright: 2006, Alexander Neundorf, <neundorf 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, Jonathan Riddell <jriddell at ubuntu.com>
 License: LGPL-2+

-- 
kimageformats packaging