[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=8f096e8

The following commit has been merged in the master branch:
commit 8f096e888ecf9c410729886695b5f05e8a11bba4
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Apr 22 08:51:26 2013 +0200

    actually make patch apply && refresh
---
 debian/patches/reduce_kwarning_usage.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/reduce_kwarning_usage.diff b/debian/patches/reduce_kwarning_usage.diff
index b15544d..c157eff 100644
--- a/debian/patches/reduce_kwarning_usage.diff
+++ b/debian/patches/reduce_kwarning_usage.diff
@@ -4,13 +4,13 @@ Date:   Fri Apr 19 13:00:15 2013 +0200
 
     Only use kWarning where necessary so the debug output can be disabled.
 
-diff --git a/agents/nepomukfeeder/itemqueue.cpp b/agents/nepomukfeeder/itemqueue.cpp
-index 6587290..c3c9c14 100644
+Index: b/agents/nepomukfeeder/itemqueue.cpp
+===================================================================
 --- a/agents/nepomukfeeder/itemqueue.cpp
 +++ b/agents/nepomukfeeder/itemqueue.cpp
-@@ -209,11 +209,10 @@ void ItemQueue::batchJobResult(KJob* job)
+@@ -192,11 +192,10 @@
    const Nepomuk2::SimpleResourceGraph graph = job->property("graph").value<Nepomuk2::SimpleResourceGraph>();
-   //FIXME: Better error handling - Store this in some error file?
+   Q_ASSERT( mBatch.isEmpty() );
    if ( job->error() ) {
 -    kWarning() << "Error while storing graph";
 +    kWarning() << "Error while storing graph: " << job->errorString();

-- 
KDE PIM Runtime module packaging