[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=75b9119

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 75b911944ecc3abe4f56f2c39f5b4620905e5d54
Merge: 3254fa3773b18ea681b173439368a4d634df9943 e362d09a1f7a2ee49d0bdd0e5f437b1b171e5dce
Author: Clive Johnston <clivejo at P500>
Date:   Wed Sep 16 10:43:47 2015 +0100

    Merge branch 'kubuntu_wily_archive' into kubuntu_unstable

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

diff --cc debian/baloo-kf5.install
index 7401594,95a1363..9f1fe4f
--- a/debian/baloo-kf5.install
+++ b/debian/baloo-kf5.install
@@@ -1,8 -1,9 +1,8 @@@
- #usr/share/locale
+ 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/polkit-1/actions/org.kde.baloo.filewatch.policy
 +usr/share/kservices5/baloosearch.protocol
 +usr/share/kservices5/tags.protocol
 +usr/share/kservices5/timeline.protocol

-- 
baloo packaging