[SCM] kimageformats packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g2e99981

Wed May 20 00:01:48 UTC 2015

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

The following commit has been merged in the kubuntu_unstable branch:
commit f332e39a774b466292dce1ac983e29c291522771
Merge: f2b6f3a44a9260e4efbb195b43e0433fef6f16d8 2bc690d2b11c07098fb2a855bca0a652dac3455b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 2 18:35:44 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/copyright

 debian/changelog | 30 +++++++++++++++++++++++++
 debian/control   |  2 +-
 debian/copyright | 67 ++++++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 79 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 9321a7d,1cab192..22cfc47

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,33 +1,50 @@@
 +kimageformats (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:36:17 +0100
 +
+ kimageformats (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:01:52 +0100
+ 
 +kimageformats (5.6.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.6.0).
 +  * Bump build dependencies to build against the experimental versions.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update build dependencies to follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 14:31:20 +0100
 +
+ kimageformats (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 20:20:08 +0100
+ 
+ kimageformats (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 12:37:23 +0100
+ 
+ kimageformats (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:14:07 +0100
+ 
+ kimageformats (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:26:46 +0100
+ 
  kimageformats (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index b7efa30,fa9072e..c9ca9b8
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,10 +3,9 @@@ Section: kd
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libjasper-dev,
                 libjpeg-dev,
                 libopenexr-dev,
                 libopenjpeg-dev,
diff --cc debian/copyright
index 822e986,f63685e..c7350a3
--- a/debian/copyright
+++ b/debian/copyright
@@@ -3,56 -3,21 +3,37 @@@ Upstream-Name: kimageformat
  Source: https://projects.kde.org/projects/frameworks/kimageformats
  
  Files: *
--       debian/*
 -Copyright: 1998 Halfdan Ingvarsson
 -           2002-2005 Nadeem Hasan <nhasan at kde.org>
 -           2003 Dominik Seichter <domseichter at web.de>
 -           2003, 2004 Ignacio Castaño <castano at ludicon.com>
 -           2005 Christoph Hormann <chris_hormann at gmx.de>
 -           2005 Ignacio Castaño <castanyo at yahoo.es>
 -           2007 Ruben Lopez <r.lopez at bren.es>
 -           2010 Troy Unrau <troy at kde.org>
 -           2014 Jonathan Riddell <jriddell at ubuntu.com>
 +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>
-            2014, Jonathan Riddell <jriddell at ubuntu.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
-  License as published by the Free Software Foundation; either
-  version 2 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
-  Library General Public License for more details.
-  .
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  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 Library General
-  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 +
 +Files: autotests/pictest.cpp
 +       autotests/readtest.cpp
 +       autotests/writetest.cpp
 +       tests/format-enum.h
 +       tests/imageconverter.cpp
 +       tests/imagedump.cpp
 +Copyright: 2014, Alex Merry <alex.merry at kde.org>
 +           2013-2014, Alex Merry <alex.merry at kdemail.net>
 +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 Library General Public
 + modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
 - version 2 of the License, or (at your option) any later version.
 + version 2.1 of the License, or (at your option) version 3, or any
 + later version accepted by the membership of KDE e.V. (or its
 + successor approved by the membership of KDE e.V.), which shall
 + act as a proxy defined in Section 6 of version 3 of the license.
   .
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@@ -90,3 -54,29 +71,51 @@@ 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+
++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
++ License as published by the Free Software Foundation; either
++ version 2 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
++ Library General Public License for more details.
++ .
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB.  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 Library General
++ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".

-- 
kimageformats packaging

