[SCM] sonnet packaging branch, kubuntu_vivid_archive, updated. 6cf28bdf6c350aa734680fc972e637a8588f6839

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 449a0f7b1ea03947b769a3d778b7ae12e6b7d820
Merge: 4435e40c3f98b64e0c040c10c130ee682f37b893 4d61c59be904931987d9e24b18b10d7a5c094db5
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 13 09:40:08 2014 +0100

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

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

diff --cc debian/changelog
index 83758c3,2ebe990..2eb159b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -13,10 -3,10 +13,13 @@@ sonnet (5.3.0-0ubuntu1) utopic; urgency
    [ Harald Sitter ]
    * Do not build depend on qt5-default, we only need qtbase5-dev
  
+   [ Scarlett Clark ]
+   * Add new build dependency to Aspell. 
+ 
 - -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 30 Sep 2014 10:46:22 +0200
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:12:01 +0100
  
  sonnet (5.2.0-0ubuntu1) utopic; urgency=medium
  

-- 
sonnet packaging