[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=775842f

The following commit has been merged in the master branch:
commit 775842f53ee3fcc4822cce2fc6abcaf73e29895d
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed Jul 9 17:25:48 2014 +0200

    * Allow for co-installability with baloo-kf5
      - create baloo-utils for kdelibs4 parts we want to keep installed
      - rename to baloo4 and provide a common baloo virtual package
---
 debian/{baloo.install => baloo-utils.install} |  6 ------
 debian/baloo4.install                         |  6 ++++++
 debian/changelog                              |  9 ++++++++-
 debian/control                                | 22 ++++++++++++++++++----
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/debian/baloo.install b/debian/baloo-utils.install
similarity index 77%
copy from debian/baloo.install
copy to debian/baloo-utils.install
index 1c5394a..26b6c80 100644
--- a/debian/baloo.install
+++ b/debian/baloo-utils.install
@@ -1,6 +1,4 @@
-etc/dbus-1/system.d/org.kde.baloo.*
 usr/bin/akonadi_baloo_indexer
-usr/bin/baloo*
 usr/lib/kde4/akonadi/akonadi_baloo_searchplugin.so
 usr/lib/kde4/akonadi/akonadibaloosearchplugin.desktop
 usr/lib/kde4/baloo_*.so
@@ -11,13 +9,9 @@ usr/lib/kde4/kio_timeline.so
 usr/lib/kde4/krunner_baloosearchrunner.so
 usr/lib/kde4/libexec/kde_baloo_filewatch_raiselimit
 usr/share/akonadi/agents/akonadibalooindexingagent.desktop
-usr/share/autostart/baloo_*
-usr/share/dbus-1/system-services/org.kde.baloo.*
-usr/share/icons/*/*/apps/baloo.png
 usr/share/kde4/services/baloo*
 usr/share/kde4/services/kcm_baloofile.desktop
 usr/share/kde4/services/plasma-runner-baloosearch.desktop
 usr/share/kde4/services/tags.protocol
 usr/share/kde4/services/timeline.protocol
 usr/share/kde4/servicetypes/baloosearchstore.desktop
-usr/share/polkit-1/actions/org.kde.baloo.*
diff --git a/debian/baloo4.install b/debian/baloo4.install
new file mode 100644
index 0000000..99609ef
--- /dev/null
+++ b/debian/baloo4.install
@@ -0,0 +1,6 @@
+etc/dbus-1/system.d/org.kde.baloo.*
+usr/bin/baloo*
+usr/share/autostart/baloo_*
+usr/share/dbus-1/system-services/org.kde.baloo.*
+usr/share/icons/*/*/apps/baloo.png
+usr/share/polkit-1/actions/org.kde.baloo.*
diff --git a/debian/changelog b/debian/changelog
index c5a5c63..7813c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
+baloo (4:4.13.2-0ubuntu3) utopic; urgency=medium
+
+  * Allow for co-installability with baloo-kf5
+    - create baloo-utils for kdelibs4 parts we want to keep installed
+    - rename to baloo4 and provide a common baloo virtual package
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 09 Jul 2014 17:24:47 +0200
+
 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 9a5497e..5c033e3 100644
--- a/debian/control
+++ b/debian/control
@@ -26,14 +26,28 @@ Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/baloo
 X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/baloo.git
 X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/baloo.git
 
-Package: baloo
+Package: baloo4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs: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), baloo (<< 4:4.13.2-0ubuntu3)
+Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
 Conflicts: baloo-kf5-data, baloo-kf5
+Provides: baloo
 Description: framework for searching and managing metadata.
  A framework for searching and managing metadata in KDE.
+ .
+ This package contains the kdelibs4 version of the binaries, it can also
+ be replaced with baloo-kf5.
+
+Package: baloo-utils
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
+Breaks: kde-runtime (<< 4:4.12.80), kde-runtime-data (<< 4:4.12.80), baloo (<< 4:4.13.2-0ubuntu3)
+Description: framework for searching and managing metadata.
+ A framework for searching and managing metadata in KDE.
+ .
+ This package contains kdelibs4 utilities for Baloo.
 
 Package: libbaloocore4
 Architecture: any
@@ -98,7 +112,7 @@ Description: Development headers for developing applications with Baloo
 
 Package: baloo-dbg
 Architecture: any
-Depends: baloo (= ${binary:Version}), ${misc:Depends}
+Depends: baloo4 (= ${binary:Version}), ${misc:Depends}
 Priority: extra
 Section: debug
 Description: Debugging symbols for baloo

-- 
baloo packaging