[SCM] baloo packaging branch, kubuntu_stable, updated. 9035d9d57480fb29f8e90ee22973cf4ce249069d

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 9035d9d57480fb29f8e90ee22973cf4ce249069d
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jan 28 15:48:36 2015 +0100

    drop conflicts/replaces on the baloo-kf5 itself and version conflict
---
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 897cd04..da26375 100644
--- a/debian/control
+++ b/debian/control
@@ -43,8 +43,7 @@ Package: baloo-kf5
 Section: utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: baloo, baloo-kf5 (<= 4:4.97.0-0ubuntu1~ubuntu14.10~ppa5)
-Replaces: baloo-kf5 (<= 4:4.97.0-0ubuntu1~ubuntu14.10~ppa5)
+Conflicts: baloo (<< 5.0)
 Provides: baloo
 Description: framework for searching and managing metadata
  A framework for searching and managing metadata in KDE Software.

-- 
baloo packaging