[SCM] solid packaging branch, master, updated. debian/5.37.0-2-85-gc9bde65

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit da4db868ed899bdaac63d43f5e30b435793cf485
Merge: a1d676aed2bfbe2baf81592354ece4d8b8638c03 79f51693c47ea8d4bed7e4281c0d3e33082a01be
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jun 30 17:13:25 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 13 +++++++++----
 debian/control   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index ad54bcc,e0b5467..6978002
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,18 @@@
- solid (5.10.0-0ubuntu1) wily; urgency=medium
+ solid (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 17:04:16 +0200
+ 
++solid (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:03:54 +0200
 +
  solid (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
@@@ -96,9 -93,9 +101,9 @@@ solid (5.2.0-0ubuntu1) utopic; urgency=
    * Use pkg-kde-tools version 3 scripts
  
    [ Scarlett Clark ]
--  * Fix qml-module-org-kde-solid.install to reflect new paths. 
--  * Move copyright extra details to comment to silence 
--    space-in-std-shortname-in-dep5-copyright lintian error. 
++  * Fix qml-module-org-kde-solid.install to reflect new paths.
++  * Move copyright extra details to comment to silence
++    space-in-std-shortname-in-dep5-copyright lintian error.
    * Revert to original install paths. Upstream Review:120229
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:35:42 +0200

-- 
solid packaging