[SCM] baloo packaging branch, kubuntu_wily_archive, updated. 51be0f18d1f771e37eb6276340a1a780762aec76

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 51be0f18d1f771e37eb6276340a1a780762aec76
Merge: 87e753698b5e6f648b45339312e3af82a62ded14 b921be1a912a43665a0b5d31f1cc653cf9c0689f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:03:04 2015 +0200

    merge master

 debian/.gitattributes           |   1 +
 debian/baloo-kf5-dev.acc.in     |  21 +++
 debian/baloo-kf5-dev.install    |   8 +-
 debian/baloo-kf5.install        |  32 ++++-
 debian/changelog                |  43 ++++++-
 debian/control                  |  31 +++--
 debian/copyright                | 274 ++++++++++++++++++++++++++--------------
 debian/libkf5baloo1.install     |   2 +-
 debian/source/lintian-overrides |   1 -
 debian/tests/acc                |  11 ++
 debian/tests/control            |   6 +
 debian/tests/testsuite          |   3 +
 debian/watch                    |   5 +-
 13 files changed, 315 insertions(+), 123 deletions(-)

diff --cc debian/changelog
index f40a595,b82838a..9931091
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,24 +1,73 @@@
 +baloo-kf5 (5.9.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:04:12 +0200
 +
 +baloo-kf5 (5.9.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:12:12 +0200
 +
 +baloo-kf5 (5.9.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 +  [ Harald Sitter ]
 +  * Fix baloo -> baloo-kf5 transitional dependency requirement to >= rather
 +    than as = cannot be met by the source:Upstream-Version substvar
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 Apr 2015 18:12:09 +0200
 +
 +baloo-kf5 (5.6.2-0ubuntu4) vivid; urgency=medium
 +
 +  * Fix baloo-kf5 replaces/conflicts baloo versions
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Mar 2015 15:42:24 +0100
 +
 +baloo-kf5 (5.6.2-0ubuntu3) vivid; urgency=medium
 +
 +  * Fix baloo to depend on baloo-kf5 without epoch
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 23:37:42 +0100
 +
 +baloo-kf5 (5.6.2-0ubuntu2) vivid; urgency=medium
 +
 +  * Add transitional baloo package with 4: epoch
 +  * Remove baloo provides
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 21:27:57 +0100
 +
 +baloo-kf5 (5.6.2-0ubuntu1) vivid; urgency=medium
 +
 +  * 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
diff --cc debian/control
index a45a586,ed9caa7..fb659c5
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,20 +1,21 @@@
  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~),
+                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