[SCM] baloo packaging branch, kubuntu_wily_archive, updated. debian/5.9.2-1-52-g6f25c86

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 6f25c86e7b7fd410f284032dca43a39eaeee0e55
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Aug 10 11:38:57 2015 +0200

    Add build-dep on liblmdb-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 ec6c168..8d0b131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 baloo-kf5 (5.13.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * new upstream release
+  * Add build-dep on liblmdb-dev
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Aug 2015 16:37:00 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Aug 2015 17:43:30 +0200
 
 baloo-kf5 (5.9.3-0ubuntu1) UNRELEASED; urgency=medium
 
diff --git a/debian/control b/debian/control
index 92e233c..58122dd 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5kdelibs4support-dev (>= 5.13.0~),
                libkf5runner-dev (>= 5.13.0~),
                libkf5solid-dev (>= 5.13.0~),
+               liblmdb-dev,
                libxapian-dev,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                plasma-framework-dev (>= 5.13.0~),

-- 
baloo packaging