[SCM] baloo packaging branch, master, updated. debian/5.19.0-1-26-geb970c1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 45acbb2a228979f57844c10c90dccd40e152a41a
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Sat Apr 30 15:13:08 2016 +0200

    Refresh patches
---
 debian/patches/disable_failing_test | 17 +++++++++++++----
 debian/patches/fix-822499.patch     | 19 +++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/debian/patches/disable_failing_test b/debian/patches/disable_failing_test
index ca12a59..6271ba9 100644
--- a/debian/patches/disable_failing_test
+++ b/debian/patches/disable_failing_test
@@ -1,8 +1,17 @@
-Index: baloo/autotests/unit/lib/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 30 Apr 2016 15:09:55 +0200
+Subject: disable_failing_test
+
 ===================================================================
---- baloo.orig/autotests/unit/lib/CMakeLists.txt	2015-08-31 21:50:27.916625507 +0200
-+++ baloo/autotests/unit/lib/CMakeLists.txt	2015-09-05 01:24:02.599336948 +0200
-@@ -5,10 +5,10 @@
+---
+ autotests/unit/lib/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/autotests/unit/lib/CMakeLists.txt b/autotests/unit/lib/CMakeLists.txt
+index d3490ed..700446a 100644
+--- a/autotests/unit/lib/CMakeLists.txt
++++ b/autotests/unit/lib/CMakeLists.txt
+@@ -5,10 +5,10 @@ ecm_add_test(queryserializationtest.cpp
      TEST_NAME "queryserializationtest"
      LINK_LIBRARIES Qt5::Test KF5::Baloo
  )
diff --git a/debian/patches/fix-822499.patch b/debian/patches/fix-822499.patch
index 10074c4..3f72531 100644
--- a/debian/patches/fix-822499.patch
+++ b/debian/patches/fix-822499.patch
@@ -1,13 +1,22 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 30 Apr 2016 15:09:55 +0200
+Subject: fix-822499
+
 Description: Fix FTBFS due missing includes
 Author: Tobias Frost <tobi at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822499
 Forwarded: no
 Last-Update: 2016-04-26
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ src/file/extractor/autotests/iohandlertest.cpp | 2 ++
+ src/file/timeestimator.cpp                     | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/file/extractor/autotests/iohandlertest.cpp b/src/file/extractor/autotests/iohandlertest.cpp
+index 2c8eeaa..e4772e6 100644
 --- a/src/file/extractor/autotests/iohandlertest.cpp
 +++ b/src/file/extractor/autotests/iohandlertest.cpp
-@@ -29,6 +29,8 @@
+@@ -30,6 +30,8 @@
  
  #include "../iohandler.h"
  
@@ -16,9 +25,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  namespace Baloo {
  class IOHandlerTest : public QObject
  {
+diff --git a/src/file/timeestimator.cpp b/src/file/timeestimator.cpp
+index cf91df7..a2affe5 100644
 --- a/src/file/timeestimator.cpp
 +++ b/src/file/timeestimator.cpp
-@@ -23,6 +23,8 @@
+@@ -25,6 +25,8 @@
  #include "timeestimator.h"
  #include "filecontentindexerprovider.h"
  
@@ -26,4 +37,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +
  using namespace Baloo;
  
- TimeEstimator::TimeEstimator(QObject* parent)
+ TimeEstimator::TimeEstimator(FileIndexerConfig *config, QObject* parent)

-- 
baloo packaging