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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 30f59bd501e680f4a1522ac5d7842770d5c1efa2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 24 17:24:26 2012 -0300

    Remove upstream patch upstream_Remove-a-FIXME-debug-message.patch.
    
    Already applied in the current version.
---
 debian/changelog                                   |    5 ---
 debian/patches/series                              |    1 -
 .../upstream_Remove-a-FIXME-debug-message.patch    |   27 --------------------
 3 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc1ae20..a1067b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,6 @@ kde-runtime (4:4.8.5-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
-  [ Pino Toscano ]
-  * 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
 
 kde-runtime (4:4.8.4-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 1d59935..8ea3a00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
-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
deleted file mode 100644
index 167b290..0000000
--- a/debian/patches/upstream_Remove-a-FIXME-debug-message.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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