[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=20376f5

The following commit has been merged in the master branch:
commit 20376f57018e251d5e441e28bd603301c3fcff70
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Thu May 29 15:53:33 2014 +0100

    * Remove explicit baloo dependency from library .symbol files
    * Add conflicts on conflicting KF5 baloo packages
---
 debian/changelog               | 7 +++++++
 debian/control                 | 6 ++++--
 debian/libbaloocore4.symbols   | 2 +-
 debian/libbaloofiles4.symbols  | 2 +-
 debian/libbaloopim4.symbols    | 2 +-
 debian/libbalooxapian4.symbols | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5a5fb8..725afcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+baloo (4:4.13.0-0ubuntu3) utopic; urgency=medium
+
+  * Remove explicit baloo dependency from library .symbol files
+  * Add conflicts on conflicting KF5 baloo packages
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 29 May 2014 15:52:39 +0100
+
 baloo (4:4.13.0-0ubuntu2) trusty; urgency=medium
 
   * Add upstream_catch_more_exceptions_emailsearchstore.patch from upstream
diff --git a/debian/control b/debian/control
index b6a99eb..69b8322 100644
--- a/debian/control
+++ b/debian/control
@@ -12,14 +12,16 @@ Build-Depends: debhelper (>= 9.0.0), cmake,
  libattr1-dev,
  libakonadi-dev (>= 1.11.80),
  libboost1.54-dev
+Build-Conflicts: libkfilemetadata5-dev
 Standards-Version: 3.9.5
 Homepage: http://projects.kde.org/baloo
 
 Package: baloo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80),
-Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80),
+Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80)
+Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80)
+Conflicts: baloo-kf5-data, baloo-kf5
 Description: framework for searching and managing metadata.
  A framework for searching and managing metadata in KDE.
 
diff --git a/debian/libbaloocore4.symbols b/debian/libbaloocore4.symbols
index 0066857..6242b25 100644
--- a/debian/libbaloocore4.symbols
+++ b/debian/libbaloocore4.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.12.97 i386
-libbaloocore.so.4 libbaloocore4 #MINVER#, baloo
+libbaloocore.so.4 libbaloocore4 #MINVER#
  _ZN5Baloo11SearchStore11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.12.80
  _ZN5Baloo11SearchStore11qt_metacastEPKc at Base 4:4.12.80
  _ZN5Baloo11SearchStore12searchStoresEv at Base 4:4.12.80
diff --git a/debian/libbaloofiles4.symbols b/debian/libbaloofiles4.symbols
index 867643b..302536f 100644
--- a/debian/libbaloofiles4.symbols
+++ b/debian/libbaloofiles4.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.12.97-0ubuntu2 amd64 i386
-libbaloofiles.so.4 libbaloofiles4 #MINVER#, baloo
+libbaloofiles.so.4 libbaloofiles4 #MINVER#
  _ZN5Baloo10TagListJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.12.80
  _ZN5Baloo10TagListJob11qt_metacastEPKc at Base 4:4.12.80
  _ZN5Baloo10TagListJob16staticMetaObjectE at Base 4:4.12.80
diff --git a/debian/libbaloopim4.symbols b/debian/libbaloopim4.symbols
index f92e15b..4eeef55 100644
--- a/debian/libbaloopim4.symbols
+++ b/debian/libbaloopim4.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.12.97 amd64
-libbaloopim.so.4 libbaloopim4 #MINVER#, baloo
+libbaloopim.so.4 libbaloopim4 #MINVER#
  _ZN5Baloo3PIM10EmailQuery11addInvolvesERK7QString at Base 4:4.12.80
  _ZN5Baloo3PIM10EmailQuery11bodyMatchesERK7QString at Base 4:4.12.80
  _ZN5Baloo3PIM10EmailQuery11setInvolvesERK11QStringList at Base 4:4.12.80
diff --git a/debian/libbalooxapian4.symbols b/debian/libbalooxapian4.symbols
index e18f240..a324307 100644
--- a/debian/libbalooxapian4.symbols
+++ b/debian/libbalooxapian4.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.13.0 i386
-libbalooxapian.so.4 libbalooxapian4 #MINVER#, baloo
+libbalooxapian.so.4 libbalooxapian4 #MINVER#
  _ZN5Baloo14XapianDatabase14deleteDocumentEj at Base 4:4.12.97
  _ZN5Baloo14XapianDatabase15replaceDocumentEjRKN6Xapian8DocumentE at Base 4:4.12.97
  _ZN5Baloo14XapianDatabase15replaceDocumentEjRKNS_14XapianDocumentE at Base 4:4.13.0

-- 
baloo packaging