[SCM] baloo packaging branch, master, updated. debian/4.13.1-1-24-ga23a630

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cd9d63fc2711c67d4d16d50bb5d55401e10ad30d
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Mon Jun 30 17:46:37 2014 +0200

    baloo-dev Conflicts: baloo-kf5-dev
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 08e66b3..c5a5c63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 baloo (4:4.13.2-0ubuntu2) utopic; urgency=medium
 
   * Remove explicit baloo dependency from library .symbol files
+  * baloo-dev Conflicts: baloo-kf5-dev
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Jun 2014 16:57:37 +0200
 
diff --git a/debian/control b/debian/control
index b629234..9a5497e 100644
--- a/debian/control
+++ b/debian/control
@@ -88,6 +88,7 @@ Depends: libbaloocore4 (= ${binary:Version}),
          libbalooxapian4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: baloo-kf5-dev
 Description: Development headers for developing applications with Baloo
  Baloo is a framework for searching and managing metadata.
  .

-- 
baloo packaging