[SCM] kimageformats packaging branch, master, updated. debian/5.37.0-2-74-gda7a626

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit deffbab4cbe44b3d6b7dbf9404f09d303bf5206d
Merge: 1ab141d5fd143a9326fb08129413a660c1b86a2f 5ee2becc1302e3a0d1a3f42ac8d05e549df31708
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:34:38 2016 +0200

    Merging master into Neon/unstable

 debian/changelog                | 13 +++++++++++++
 debian/control                  | 23 ++++-------------------
 debian/rules                    |  8 ++++++--
 debian/tests/control            |  4 ++++
 debian/tests/testsuite          |  8 ++++++++
 debian/tests/testsuite.xsession |  8 ++++++++
 debian/upstream/metadata        |  7 +++++++
 debian/watch                    |  1 -
 8 files changed, 50 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index 1ddb2db,b8525de..8e12ef9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
 +kimageformats (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:23:42 +0000
 +
 +kimageformats (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:06:31 +0000
 +
+ kimageformats (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:15:50 +0100
+ 
+ kimageformats (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:21 +0100
+ 
 +kimageformats (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:03:26 +0100
 +
  kimageformats (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 50505d7,21a4e65..2d828aa
--- a/debian/control
+++ b/debian/control
@@@ -5,10 -5,9 +5,10 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.18.0~),
+                extra-cmake-modules (>= 5.19.0~),
                 libjasper-dev,
                 libjpeg-dev,
 +               libkf5archive-dev,
                 libopenexr-dev,
                 libopenjpeg-dev,
                 pkg-config,

-- 
kimageformats packaging