[SCM] baloo packaging branch, master, updated. 072cebf3e6d2c39ee5653ff7743679df2a138d0b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 96e25f719ec7ca41ee48bd1be4345039e483dff9
Merge: c6859743b544a7dc99f3070cc8b47f6d2599ef6d b2628f1b8400b24f2fac19fe7c90f7ffd45729b2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Mar 21 10:28:53 2015 +0100

    Merge branch 'master' of git://git.debian.org/git/pkg-kde/plasma/baloo
    
    Conflicts:
    	debian/changelog

 debian/changelog | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 8c96be8,4aa8684..edea786
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,20 +1,61 @@@
+ baloo-kf5 (5.6.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
 - 
++  * Bump version depends.
++  * Update renamed dependency kfilemetadata-dev
++  * Fix version.
++
+  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 20:54:03 -0700
+ 
 -baloo-kf5 (5.6.1-0ubuntu1) UNRELEASED; urgency=medium
 +baloo-kf5 (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update install files.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Add myself as Uploader.
 +  * Update copyright information.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +  * Add missing dev dependency (thanks to acc headers check)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 07 Feb 2015 18:39:29 +0100
 +
 +baloo-kf5 (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
 -  * Bump version depends.
 -  * Update renamed dependency kfilemetadata-dev
 -  * Fix version.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Sep 2014 06:38:18 -0700
 + -- Harald Sitter <sitter at kde.org>  Mon, 26 Jan 2015 13:59:33 +0100
 +
 +baloo-kf5 (5.5.95-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Jan 2015 13:49:10 +0100
 +
 +baloo-kf5 (5.1.1-0ubuntu1) vivid; urgency=medium
  
 -baloo-kf5 (5.0.1b-0ubuntu1) UNRELEASED; urgency=medium
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 10 Nov 2014 19:37:40 +0100
 +
 +baloo-kf5 (5.1.0.1-0ubuntu4) vivid; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Lintian override missing manpage warnings (we don't care)
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 06 Nov 2014 15:24:27 +0100
 +
 +baloo-kf5 (5.0.2-0ubuntu1) utopic; urgency=medium
 +
 +  * New upstream release
 +  * Bump version depends.
 +  * Update renamed dependency kfilemetadata-dev
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Sep 2014 06:38:18 -0700
- 
- baloo-kf5 (5.0.1b-0ubuntu1) UNRELEASED; urgency=medium
- 
    [ Jonathan Riddell ]
    * New upstream bugfix release
  
@@@ -60,7 -24,7 +65,7 @@@
    * baloo-kf5-dev depends on libkf5filemetadata1-dev (as seen in its
      CMakeConfig)
  
-- -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 10 Aug 2014 16:53:31 +0200
++ -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Sep 2014 06:38:18 -0700
  
  baloo-kf5 (5.0.0b-0ubuntu1) utopic; urgency=medium
  

-- 
baloo packaging