[SCM] baloo packaging branch, kubuntu_vivid_backports, updated. ubuntu/5.14.0-0ubuntu3-10-g96f3cae

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit d61cce1e2c01e0172bc66910b88c8175384f337f
Merge: 75b911944ecc3abe4f56f2c39f5b4620905e5d54 e60fc2216198c495fa48f9c03c800f24eb5a8c86
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Sep 17 14:37:08 2015 +0100

    merge

 debian/baloo-kf5.install | 3 ++-
 debian/changelog         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc debian/baloo-kf5.install
index 9f1fe4f,af36088..b5b8b15
--- a/debian/baloo-kf5.install
+++ b/debian/baloo-kf5.install
@@@ -1,8 -1,9 +1,9 @@@
- usr/share/locale
  etc
  usr/bin
 -usr/lib/*/libexec
  usr/lib/*/qt5
 -usr/share/dbus-1/system-services/org.kde.baloo.filewatch.service
  usr/share/icons/hicolor/128x128/apps/baloo.png
 -usr/share/kservices5/*
 +usr/share/kservices5/baloosearch.protocol
 +usr/share/kservices5/tags.protocol
 +usr/share/kservices5/timeline.protocol
+ usr/share/locale
+ usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy

-- 
baloo packaging