[SCM] solid packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g2dc5fee

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8401b58694e01087bbc05608af47700f4acede0d
Merge: b6119720c680b493eeee220792da4b14b853bd10 37d0a7fc10f77d3a264ac53cdee516ffe1b15680
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 4 11:14:20 2015 +0100

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

 debian/changelog                         | 34 ++++++++++++++++++++++++++++++++
 debian/control                           |  3 +--
 debian/libkf5solid-bin.lintian-overrides |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 2951456,e8afec4..c635eb0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,37 +1,59 @@@
 +solid (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:40:29 +0100
 +
+ solid (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:51:02 +0100
+ 
 +solid (5.6.0-1) experimental; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Do not build depend on qt5-default, we only need qtbase5-dev
 +
 +  [ Maximiliano Curia ]
 +  * 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.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 24 Jan 2015 18:57:50 +0100
 +
+ solid (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 20:12:45 +0100
+ 
+ solid (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 12:46:55 +0100
+ 
+ solid (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:04:02 +0100
+ 
+ solid (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Do not build depend on qt5-default, we only need qtbase5-dev
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:13:34 +0100
+ 
  solid (5.2.0-0ubuntu1) utopic; urgency=medium
  
    [ Jonathan Riddell ]
diff --cc debian/control
index 4c5ae73,3d55519..afc2468
--- a/debian/control
+++ b/debian/control
@@@ -4,9 -4,9 +4,8 @@@ Priority: optiona
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: bison,
 -               cmake,
 -               debhelper (>= 9.0.0),
 +               cmake (>= 2.8.12),
-                debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 flex,
                 libhupnp-dev,
                 libudev-dev [linux-any],

-- 
solid packaging