[SCM] kdeclarative packaging branch, master, updated. 6b87d058f68a52b59dfc9d02f06f8f9bf8e101e5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a8831e17458d540ece35379e83992d4c7cac7602
Merge: d03cfb297d6ec40cae8c52e186c058dfe05675e7 2de692cca072ef11fe88df483d246da8dcd03bae
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 11:17:37 2015 +0200

    Merge commit '2de692cca072ef11fe88df483d246da8dcd03bae'
    
    Conflicts:
    	debian/control
    	debian/libkf5quickaddons5.symbols

 debian/changelog                  |  6 +++++
 debian/control                    |  3 +++
 debian/libkf5quickaddons5.symbols | 51 +++++++++++++++++++++++++++++++++------
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index cf0b0bd,81da78d..383a0c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,9 +1,24 @@@
 +kdeclarative (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:23:30 +0200
 +
+ kdeclarative (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:26:36 +0200
+ 
 +kdeclarative (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Remove upstream applied patch: kubuntu_fix_epoxy_vs_qopengl.diff
 +  * Update symbols files.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:54 +0100
 +
  kdeclarative (5.8.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kdeclarative packaging