[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=f82d97c

The following commit has been merged in the master branch:
commit f82d97c9e3c727044955b4d9dbe31b0f4a17e1d3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 14 18:10:12 2014 +0200

    Remove upstream patches
---
 debian/patches/series                              |  2 --
 ...pstream_FileIndexingQueue-Catch-exception.patch | 30 ----------------------
 ...am_catch_more_exceptions_emailsearchstore.patch | 13 ----------
 3 files changed, 45 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index a250d24..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-upstream_catch_more_exceptions_emailsearchstore.patch
-upstream_FileIndexingQueue-Catch-exception.patch
diff --git a/debian/patches/upstream_FileIndexingQueue-Catch-exception.patch b/debian/patches/upstream_FileIndexingQueue-Catch-exception.patch
deleted file mode 100644
index ebad106..0000000
--- a/debian/patches/upstream_FileIndexingQueue-Catch-exception.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit a7386f97164dbc9b67e032ed57ffe563d5d41ba9
-Author: Vishesh Handa <me at vhanda.in>
-Date:   Tue Apr 15 15:22:00 2014 +0200
-
-    FileIndexingQueue: Catch exception
-    
-    This can happen in the case when the extractor fails to index a file and
-    at the same time managed to remove the indexed data from the xapian db.
-    So weird.
-
-diff --git a/src/file/fileindexingqueue.cpp b/src/file/fileindexingqueue.cpp
-index 6c1e946..bfce37e 100644
---- a/src/file/fileindexingqueue.cpp
-+++ b/src/file/fileindexingqueue.cpp
-@@ -98,10 +98,13 @@ void FileIndexingQueue::slotFinishedIndexingFile(KJob*)
- void FileIndexingQueue::slotIndexingFailed(uint id)
- {
-     m_db->xapianDatabase()->db()->reopen();
--    Xapian::Document doc = m_db->xapianDatabase()->db()->get_document(id);
--
--    updateIndexingLevel(doc, -1);
--    Q_EMIT newDocument(id, doc);
-+    Xapian::Document doc;
-+    try {
-+        Xapian::Document doc = m_db->xapianDatabase()->db()->get_document(id);
-+        updateIndexingLevel(doc, -1);
-+        Q_EMIT newDocument(id, doc);
-+    } catch (const Xapian::Error& err) {
-+    }
- }
diff --git a/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch b/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch
deleted file mode 100644
index e0cf3b1..0000000
--- a/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: baloo-4.13.0/src/pim/search/email/emailsearchstore.cpp
-===================================================================
---- baloo-4.13.0.orig/src/pim/search/email/emailsearchstore.cpp	2014-04-09 12:33:16.000000000 +0200
-+++ baloo-4.13.0/src/pim/search/email/emailsearchstore.cpp	2014-04-15 11:45:22.754275526 +0200
-@@ -105,7 +105,7 @@
-     try {
-         data = doc.get_data();
-     }
--    catch (const Xapian::DatabaseError&) {
-+    catch (const Xapian::Error&) {
-         // Nothing to do, move along
-     }
- 

-- 
baloo packaging