[SCM] solid packaging branch, master, updated. debian/5.8.0-1-11-g0279395

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2796c34ed620855e13648462bae031f38ca0550c
Merge: c564bc53e3b1ffbc8eec6a32afd415e57facf6d2 15aad78af831304c7f8ff84253421a1bb504d79d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 14:04:44 2015 +0200

    Merge commit '15aad78af831304c7f8ff84253421a1bb504d79d'
    
    Conflicts:
    	debian/control
    	debian/libkf5solid5.symbols

 debian/changelog            | 12 ++++++++++++
 debian/libkf5solid5.symbols |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 0dc6cca,ffa9d78..728bb07
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +solid (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:05 +0200
 +
+ solid (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:20:12 +0200
+ 
 +solid (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 22:27:07 +0100
 +
+ solid (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:46:36 +0100
+ 
 +solid (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Mar 2015 17:45:34 +0100
 +
  solid (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
solid packaging