[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=bfc20e3

The following commit has been merged in the master branch:
commit bfc20e3ac63388cc5d16331c52b4646f003a827f
Author: Philip Muskovac <yofel at gmx.net>
Date:   Mon Mar 17 19:36:57 2014 +0100

    * Don't depend on baloo, kde-runtime, kdepim-runtime to stop
      circular deps
    * baloo-dev doesn't depend on baloo to stop circular deps
---
 debian/changelog | 3 +++
 debian/control   | 3 +--
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a6bc7c..4b21f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ baloo (4:4.12.90-0ubuntu1) UNRELEASED; urgency=low
 
   [ Jonathan Riddell ]
   * Initial release
+  * Don't depend on baloo, kde-runtime, kdepim-runtime to stop
+    circular deps
+  * baloo-dev doesn't depend on baloo to stop circular deps
 
   [ Scarlett Clark ]
   * Fix copyright
diff --git a/debian/control b/debian/control
index c6cb0ca..4b4f353 100644
--- a/debian/control
+++ b/debian/control
@@ -70,8 +70,7 @@ Description: Xapian funcationality for Baloo
 Package: baloo-dev
 Architecture: any
 Section: libdevel
-Depends: baloo (= ${binary:Version}),
- libbaloocore4 (= ${binary:Version}),
+Depends: libbaloocore4 (= ${binary:Version}),
  libbaloofiles4 (= ${binary:Version}),
  libbaloopim4 (= ${binary:Version}),
  libbalooxapian4 (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 2fa261b..d7bfcf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@ override_dh_strip:
 .PHONY: override_dh_auto_test
 
 override_dh_shlibdeps:
-	 $(overridden_command) -- -xbaloo
+	 $(overridden_command) -- -xbaloo -xkde-runtime -xkdepim-runtime

-- 
baloo packaging