[SCM] baloo packaging branch, kubuntu_unstable, updated. debian/5.9.2-1-18-g38dbbcc

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 38dbbcca6ee5c12a5bb5fed71ab57a36e93775e2
Merge: 6370f98701ccf6c6d33dd4f4f9f4c2cd91968bf9 51be0f18d1f771e37eb6276340a1a780762aec76
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 10:19:27 2015 +0200

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/baloo-kf5.install |  2 +-
 debian/changelog         | 37 +++++++++++++++++++++----------------
 debian/control           |  9 ++++++++-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --cc debian/baloo-kf5.install
index 2489216,c9f3735..c7a2b14
--- 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/kservices5/*
- usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy
+ usr/share/polkit-1/actions/org.kde.baloo.filewatch.policy
diff --cc debian/changelog
index 24342de,9931091..edb140b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,9 @@@
 -baloo-kf5 (5.9.2-0ubuntu1) UNRELEASED; urgency=medium
 +baloo-kf5 (5.9.2-1) unstable; urgency=medium
  
-   * New upstream release (5.9.0).
-   * New upstream release (5.9.1).
 -  * New upstream release
 +  * New upstream release (5.9.2).
 +  * Update copyright information.
  
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:04:12 +0200
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 01 Jul 2015 09:23:52 +0200
  
  baloo-kf5 (5.9.1-0ubuntu1) wily; urgency=medium
  
@@@ -57,13 -44,34 +41,34 @@@ baloo-kf5 (5.6.2-0ubuntu1) vivid; urgen
  
    * New upstream release
    * Release to Archive
 - 
 +
   -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 20:54:03 -0700
  
+ baloo-kf5 (5.9.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.9.0).
+   * New upstream release (5.9.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:54:43 +0200
+ 
+ baloo-kf5 (5.6.2-1) experimental; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+   * Bump version depends.
+   * Update renamed dependency kfilemetadata-dev
+   * Fix version.
+ 
+   [ Maximiliano Curia ]
+   * Prepare Debian release. (5.6.1-1)
+   * New upstream release (5.6.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:29 +0100
+ 
  baloo-kf5 (5.6.1-0ubuntu1) vivid; urgency=medium
  
 -  *  New upstream release
 -  * Bump kfilemetadata version so hopefully armhf will find it. 
 +  * New upstream release
 +  * Bump kfilemetadata version so hopefully armhf will find it.
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:52:31 -0800
  
diff --cc debian/control
index 8ec9a3d,fb659c5..af0273b
--- a/debian/control
+++ b/debian/control
@@@ -7,7 -7,15 +7,14 @@@ Build-Depends: cmake (>= 2.8.12)
                 dbus-x11,
                 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.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),

-- 
baloo packaging