[SCM] baloo packaging branch, master, updated. debian/5.13.0-1-3-g72fd058

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 17f7431b14404343ec9e11e38725ba6306273261
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Jul 14 11:40:13 2015 -0400

    Baloo-kf5 Breaks vice Conflicts baloo
---
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e92301..3f365d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ baloo-kf5 (5.9.2-3) unstable; urgency=medium
 
   * Team upload.
   * Change baloo transitional package from arch any to arch all
+  * Baloo-kf5 Breaks vice Conflicts baloo 
 
- -- Scott Kitterman <scott at kitterman.com>  Tue, 14 Jul 2015 10:50:08 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 14 Jul 2015 11:37:49 -0400
 
 baloo-kf5 (5.9.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b0ebdf1..4c9ba14 100644
--- a/debian/control
+++ b/debian/control
@@ -54,8 +54,8 @@ Package: baloo-kf5
 Section: utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Conflicts: baloo (<< 4:5.0)
+Breaks: baloo (<< 4:5.0),
+        ${kde-l10n:all}
 Replaces: baloo (<< 4:5.0),
           ${kde-l10n:all}
 Description: framework for searching and managing metadata

-- 
baloo packaging