[SCM] sonnet packaging branch, master, updated. debian/5.37.0-2-100-g6ea1571

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8859797c5c7d11a30556061b2c572b4f5d01faf0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Aug 10 11:50:02 2015 +0200

    Add build-dep on libvoikko-dev
---
 debian/.gitattributes | 1 -
 debian/changelog      | 3 ++-
 debian/control        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index c8faf6b..87ea673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 sonnet (5.13.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * new upstream release
+  * Add build-dep on libvoikko-dev
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Aug 2015 16:18:52 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Aug 2015 17:53:22 +0200
 
 sonnet (5.12.0-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index b124db7..21692eb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cmake (>= 2.8.12),
                hspell,
                libaspell-dev,
                libhunspell-dev,
+               libvoikko-dev,
                pkg-config,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),

-- 
sonnet packaging