[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-g0fbf6e8

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 0fbf6e8a48a08871cd63abc2e7207df3e306c2f9
Merge: 370aff96958c9ebe3c95e46b35f0ccade5dea6dc a59e22ac6adfbf28faf73753154e3dd254de62cc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:56:35 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 2e235cd,e3e19e5..0b9a656
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+ kdeclarative (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:11:44 -0700
+ 
 +kdeclarative (5.11.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.10.0).
 +  * New upstream release (5.11.0).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:13:38 +0200
 +
  kdeclarative (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]

-- 
kdeclarative packaging