[SCM] baloo packaging branch, kubuntu_unstable, updated. debian/5.9.2-1-16-g6370f98

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 6370f98701ccf6c6d33dd4f4f9f4c2cd91968bf9
Merge: 5a9319941d1f53adc0bb5b8fe3c5ce10e40dadb2 1391c65420aad7cd4db13efb6fd89e51131acb37
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:17:06 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/baloo-kf5.install
    	debian/control
    	debian/libkf5baloo2.install

 debian/.gitattributes           |   1 +
 debian/baloo-kf5-dev.acc.in     |  21 +++
 debian/baloo-kf5.install        |   2 +-
 debian/changelog                |  54 +++++--
 debian/control                  |  22 +--
 debian/copyright                | 324 ++++++++++++++++++++++++++--------------
 debian/libkf5baloo2.install     |   2 +-
 debian/source/lintian-overrides |   1 -
 debian/tests/acc                |  11 ++
 debian/tests/control            |   6 +
 debian/tests/testsuite          |   3 +
 debian/watch                    |   5 +-
 12 files changed, 313 insertions(+), 139 deletions(-)

diff --cc debian/baloo-kf5.install
index c7a2b14,c9f3735..2489216
--- a/debian/baloo-kf5.install
+++ b/debian/baloo-kf5.install
@@@ -1,9 -1,29 +1,9 @@@
 -etc/dbus-1/system.d/org.kde.baloo.filewatch.conf
 -etc/xdg/autostart/baloo_file.desktop
 -usr/bin/baloo_file
 -usr/bin/baloo_file_cleaner
 -usr/bin/baloo_file_extractor
 -usr/bin/balooctl
 -usr/bin/baloosearch
 -usr/bin/balooshow
 -usr/lib/*/libexec/kauth/kde_baloo_filewatch_raiselimit
 -usr/lib/*/qt5/plugins/kded_baloosearch_kio.so
 -usr/lib/*/qt5/plugins/kf5/kio/baloosearch.so
 -usr/lib/*/qt5/plugins/kf5/kio/tags.so
 -usr/lib/*/qt5/plugins/kf5/kio/timeline.so
 -usr/lib/*/qt5/qml/org/kde/baloo/
 +#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/baloosearch.protocol
 -usr/share/kservices5/kded/baloosearchfolderupdater.desktop
 -usr/share/kservices5/tags.protocol
 -usr/share/kservices5/timeline.protocol
 -usr/share/locale/*/*/baloo_file.mo
 -usr/share/locale/*/*/baloo_file_extractor.mo
 -usr/share/locale/*/*/balooctl.mo
 -usr/share/locale/*/*/baloosearch.mo
 -usr/share/locale/*/*/balooshow.mo
 -usr/share/locale/*/*/kio_baloosearch.mo
 -usr/share/locale/*/*/kio_tags.mo
 -usr/share/locale/*/*/kio_timeline.mo
 -usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy
 +usr/share/kservices5/*
- usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy
++usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy
diff --cc debian/control
index ff6908c,b26a581..8ec9a3d
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,45 +1,36 @@@
  Source: baloo-kf5
- Priority: extra
+ Section: kde
+ Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Build-Depends: cmake,
+ Uploaders: Maximiliano Curia <maxy at debian.org>
+ Build-Depends: cmake (>= 2.8.12),
                 dbus-x11,
-                debhelper (>= 9.0.0),
+                debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
-                libkf5filemetadata-dev (>= 5.9.2),
 -               kinit-dev (>= 5.0.0),
 -               kio-dev (>= 5.0.0),
 -               libkf5auth-dev (>= 5.0.0),
 -               libkf5config-dev (>= 5.0.0),
 -               libkf5crash-dev (>= 5.0.0),
 -               libkf5dbusaddons-dev (>= 5.0.0~),
+                libkf5filemetadata-dev (>= 5.9.2~),
 -               libkf5i18n-dev (>= 5.0.0),
                 libkf5idletime-dev (>= 5.2.0),
                 libkf5kcmutils-dev (>= 5.2.0),
                 libkf5kdelibs4support-dev (>= 5.2.0),
                 libkf5runner-dev (>= 5.2.0),
 -               libkf5solid-dev (>= 5.0.0),
 -               libxapian-dev,
 +               liblmdb-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 plasma-framework-dev (>= 5.2.0),
 -               qtbase5-dev (>= 5.4),
 -               qtdeclarative5-dev (>= 5.4)
 +               qtbase5-dev,
 +               qtdeclarative5-dev
- Standards-Version: 3.9.5
- Section: kde
+ Standards-Version: 3.9.6
+ XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/kde/kdelibs/baloo
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/baloo.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/baloo.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/baloo.git
  
  Package: baloo-kf5-dev
  Section: devel
  Architecture: any
  Depends: baloo-kf5 (= ${binary:Version}),
 -         libkf5baloo1 (= ${binary:Version}),
 -         libkf5balooxapian1 (= ${binary:Version}),
 +         libkf5baloo2 (= ${binary:Version}),
 +         libkf5balooengine2 (= ${binary:Version}),
-          libkf5filemetadata-dev,
+          libkf5coreaddons-dev,
+          libkf5filemetadata-dev (>= 5.9.2~),
 -         libxapian-dev,
           ${misc:Depends},
           ${shlibs:Depends}
  Conflicts: baloo-dev
diff --cc debian/libkf5baloo2.install
index de40845,af1b9f6..1881c05
--- a/debian/libkf5baloo2.install
+++ b/debian/libkf5baloo2.install
@@@ -1,2 -1,2 +1,2 @@@
 -usr/lib/*/libKF5Baloo.so.1
 +usr/lib/*/libKF5Baloo.so.2
- usr/lib/*/libKF5Baloo.so.5*
+ usr/lib/*/libKF5Baloo.so.5.*

-- 
baloo packaging