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

The following commit has been merged in the master branch:
commit f072c0c38e315214b780de0a58e98da9ce6fdf28
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue May 28 22:19:09 2013 +0200

    Update patches.
---
 debian/changelog                          |    1 +
 debian/patches/hide_akonaditray.diff      |    8 +++++---
 debian/patches/reduce_kwarning_usage.diff |   24 ------------------------
 debian/patches/series                     |    1 -
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7ab59e..14eb995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepim-runtime (4:4.10.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 28 May 2013 22:15:26 +0200
 
diff --git a/debian/patches/hide_akonaditray.diff b/debian/patches/hide_akonaditray.diff
index d6d3972..3e76356 100644
--- a/debian/patches/hide_akonaditray.diff
+++ b/debian/patches/hide_akonaditray.diff
@@ -3,9 +3,11 @@ Description: Hide akonaditray to not show up in the menu.
 Last-Update: 2011-10-21
 Forwarded: no
 
---- a/tray/akonaditray.desktop
-+++ b/tray/akonaditray.desktop
-@@ -80,3 +80,4 @@ GenericName[uk]=Утиліта лоткÐ
+Index: kdepim-runtime/tray/akonaditray.desktop
+===================================================================
+--- kdepim-runtime.orig/tray/akonaditray.desktop	2013-05-28 22:17:07.002066577 +0200
++++ kdepim-runtime/tray/akonaditray.desktop	2013-05-28 22:17:07.002066577 +0200
+@@ -98,3 +98,4 @@
  GenericName[x-test]=xxAkonadi Tray Utilityxx
  GenericName[zh_CN]=Akonadi 托盘工具
  GenericName[zh_TW]=Akonadi 系統匣工具
diff --git a/debian/patches/reduce_kwarning_usage.diff b/debian/patches/reduce_kwarning_usage.diff
deleted file mode 100644
index c157eff..0000000
--- a/debian/patches/reduce_kwarning_usage.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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.
-
-Index: b/agents/nepomukfeeder/itemqueue.cpp
-===================================================================
---- a/agents/nepomukfeeder/itemqueue.cpp
-+++ b/agents/nepomukfeeder/itemqueue.cpp
-@@ -192,11 +192,10 @@
-   const Nepomuk2::SimpleResourceGraph graph = job->property("graph").value<Nepomuk2::SimpleResourceGraph>();
-   Q_ASSERT( mBatch.isEmpty() );
-   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 01e34d7..5879913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 hide_akonaditray.diff
-reduce_kwarning_usage.diff

-- 
KDE PIM Runtime module packaging