[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.8.4-1-3-g4e95870

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 4e9587011bf6dc5ab8b7e2ae0e1402f29d9a18a0
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 8 12:17:53 2012 +0200

    remove a spammy "FIXME" debug message (#677625)
    
    backport upstream commit d9234cca36319cb6895d4a7d36030a95923d1373
    (from the nepomuk-core repository)
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 .../upstream_Remove-a-FIXME-debug-message.patch    |   27 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e7c4e2..53a27f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ kde-runtime (4:4.8.4-2) UNRELEASED; urgency=low
   * Backport upstream commit 9145b51c1cc4e9ecd273e8eb41de1bbcdd607e35 to not
     claim thumbnail support for the image/x-wmf and image/x-xfig mimetypes;
     patch upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch.
+  * Backport upstream commit d9234cca36319cb6895d4a7d36030a95923d1373 (from
+    the nepomuk-core repository) to remove a spammy "FIXME" debug message;
+    patch upstream_Remove-a-FIXME-debug-message.patch. (Closes: #677625)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Jul 2012 12:04:09 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 2d97940..4abe996 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
 upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
+upstream_Remove-a-FIXME-debug-message.patch
diff --git a/debian/patches/upstream_Remove-a-FIXME-debug-message.patch b/debian/patches/upstream_Remove-a-FIXME-debug-message.patch
new file mode 100644
index 0000000..167b290
--- /dev/null
+++ b/debian/patches/upstream_Remove-a-FIXME-debug-message.patch
@@ -0,0 +1,27 @@
+From d9234cca36319cb6895d4a7d36030a95923d1373 Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me at vhanda.in>
+Date: Fri, 15 Jun 2012 18:37:56 +0530
+Subject: [PATCH] Remove a FIXME debug message
+
+It's not a good idea to spam the users with FIXME errors.
+
+BUG: 300323
+---
+ services/storage/resourcewatchermanager.cpp |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/nepomuk/services/storage/resourcewatchermanager.cpp b/nepomuk/services/storage/resourcewatchermanager.cpp
+index 4ef5d6b..80883a4 100644
+--- a/nepomuk/services/storage/resourcewatchermanager.cpp
++++ b/nepomuk/services/storage/resourcewatchermanager.cpp
+@@ -120,7 +120,6 @@ Nepomuk2::ResourceWatcherManager::~ResourceWatcherManager()
+ void Nepomuk::ResourceWatcherManager::addStatement(const Soprano::Statement& st)
+ {
+     // FIXME!
+-    kError() << "FIXME";
+     //addProperty( st.subject(), st.predicate().uri(), QList<Soprano::Node>() << st.object() );
+ }
+ 
+-- 
+1.7.10.4
+

-- 
KDE Base Runtime module packaging