[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=3346c36

The following commit has been merged in the master branch:
commit 3346c369fdc2929a03cf6a0be12a4eb3502fd469
Merge: 291ac8b0d758ce7176fec0040bb2f8ddd295e0a2 e67559cb012af2cda0639896593bcefec7e1abbd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 31 23:39:38 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_wily_archive'

 debian/.gitattributes                              |   1 -
 debian/baloo-kf5-dev.acc.in                        |   2 +-
 debian/baloo-kf5-dev.install                       |   9 +-
 debian/baloo-kf5.install                           |  32 +--
 debian/changelog                                   |  75 +++++--
 debian/control                                     |  36 ++--
 debian/libkf5baloo1.symbols                        | 227 ---------------------
 .../{libkf5baloo1.install => libkf5baloo5.install} |   2 +-
 debian/libkf5baloo5.symbols                        | 127 ++++++++++++
 debian/libkf5balooengine5.install                  |   2 +
 debian/libkf5balooengine5.symbols.README           |   1 +
 debian/libkf5balooxapian1.install                  |   2 -
 debian/libkf5balooxapian1.symbols                  |  57 ------
 13 files changed, 217 insertions(+), 356 deletions(-)

diff --cc debian/changelog
index d0b2ef6,2d2261a..1747566
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,40 +1,52 @@@
 +baloo-kf5 (5.13.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.13.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 30 Aug 2015 22:12:03 +0200
 +
+ baloo-kf5 (5.13.0-0ubuntu2) wily; urgency=medium
+ 
+   * Fix libraries in acc input file to hopefully make autopkgtests pass again.
+ 
+  -- Iain Lane <iain at orangesquash.org.uk>  Thu, 13 Aug 2015 12:22:25 +0100
+ 
+ baloo-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+   * Add build-dep on liblmdb-dev
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:46:04 +0200
+ 
+ baloo-kf5 (5.9.3-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+   * wrap-and-sort.
+   * Fix version
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 12:34:31 -0700
+ 
 +baloo-kf5 (5.9.2-2) unstable; urgency=medium
 +
 +  * Add the missing Breaks/Replaces. (Closes: #789166)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 14:07:50 +0200
 +
+ baloo-kf5 (5.9.2-0ubuntu2) wily; urgency=medium
+ 
+   * Update symbols files: add a couple of optional symbols after building with
+     GCC 5
+ 
+  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 22 Jul 2015 21:50:57 +0200
+ 
+ baloo-kf5 (5.9.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:25:29 +0000
+ 
  baloo-kf5 (5.9.2-1) unstable; urgency=medium
  
-   * New upstream release (5.9.0).
-   * New upstream release (5.9.1).
    * New upstream release (5.9.2).
    * Update copyright information.
  
diff --cc debian/control
index bb001f0,58122dd..7412ad2
--- a/debian/control
+++ b/debian/control
@@@ -31,11 -37,10 +31,10 @@@ Package: baloo-kf5-de
  Section: devel
  Architecture: any
  Depends: baloo-kf5 (= ${binary:Version}),
-          libkf5baloo1 (= ${binary:Version}),
-          libkf5balooxapian1 (= ${binary:Version}),
+          libkf5baloo5 (= ${binary:Version}),
+          libkf5balooengine5 (= ${binary:Version}),
           libkf5coreaddons-dev,
 -         libkf5filemetadata-dev (>= 5.9.2~),
 +         libkf5filemetadata-dev (>= 5.13.0~),
-          libxapian-dev,
           ${misc:Depends},
           ${shlibs:Depends}
  Conflicts: baloo-dev
@@@ -62,6 -77,8 +72,8 @@@ Package: libkf5baloo
  Section: libs
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
 -Breaks: libkf5baloo2 (<< 5.9.3+git20150805)
 -Replaces: libkf5baloo2 (<< 5.9.3+git20150805)
++Breaks: libkf5baloo1, libkf5baloo2 (<< 5.9.3+git20150805), libkf5balooxapian1
++Replaces: libkf5baloo1, libkf5baloo2 (<< 5.9.3+git20150805), libkf5balooxapian1
  Description: framework for searching and managing metadata core lib.
   A framework for searching and managing metadata in KDE Software.
   .

-- 
baloo packaging