[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=b870e93

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

    Take a patch from upstream to reduce the warnings from the nepomuk-feeder.
---
 debian/changelog                          |    1 +
 debian/patches/reduce_kwarning_usage.diff |   24 ++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c457bfd..6a428d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepim-runtime (4:4.10.2-3) UNRELEASED; urgency=low
 
   * Shuffle around build-deps to work around aptitude.
+  * Take a patch from upstream to reduce the warnings from the nepomuk-feeder.
 
  -- Sune Vuorela <sune at debian.org>  Sat, 20 Apr 2013 09:06:00 +0200
 
diff --git a/debian/patches/reduce_kwarning_usage.diff b/debian/patches/reduce_kwarning_usage.diff
new file mode 100644
index 0000000..b15544d
--- /dev/null
+++ b/debian/patches/reduce_kwarning_usage.diff
@@ -0,0 +1,24 @@
+commit 8097d5889c0b31c749dc4ddd59e19d1ca163ef9f
+Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
+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
+--- a/agents/nepomukfeeder/itemqueue.cpp
++++ b/agents/nepomukfeeder/itemqueue.cpp
+@@ -209,11 +209,10 @@ void ItemQueue::batchJobResult(KJob* job)
+   const Nepomuk2::SimpleResourceGraph graph = job->property("graph").value<Nepomuk2::SimpleResourceGraph>();
+   //FIXME: Better error handling - Store this in some error file?
+   if ( job->error() ) {
+-    kWarning() << "Error while storing graph";
++    kWarning() << "Error while storing graph: " << job->errorString();
+     foreach( const Nepomuk2::SimpleResource &res, graph.toList() ) {
+-        kWarning() << res;
++        kDebug() << res;
+     }
+-    kWarning() << job->errorString();
+   } else {
+     Nepomuk2::StoreResourcesJob *storeResourcesJob = static_cast<Nepomuk2::StoreResourcesJob*>(job);
+     Q_ASSERT(storeResourcesJob);
diff --git a/debian/patches/series b/debian/patches/series
index 5879913..01e34d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hide_akonaditray.diff
+reduce_kwarning_usage.diff

-- 
KDE PIM Runtime module packaging