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

The following commit has been merged in the master branch:
commit c25644a514279d36cae1969529aecc7e5bcba91d
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Tue Apr 8 13:26:19 2014 +0200

    Add upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch
    fixing a crash when changing the file rating in dolphin.
---
 debian/changelog                                   |  7 +++
 debian/patches/series                              |  1 +
 ...0049-XapianDatabase-Catch-more-exceptions.patch | 61 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fb1e5ea..97f4215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+baloo (4:4.12.97-0ubuntu3) trusty; urgency=medium
+
+  * Add upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch
+    fixing a crash when changing the file rating in dolphin.
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 08 Apr 2014 13:10:09 +0200
+
 baloo (4:4.12.97-0ubuntu2) trusty; urgency=medium
 
   * Blanket import fixes between 4.12.97 and current git KDE/4.13 in
diff --git a/debian/patches/series b/debian/patches/series
index 3208147..0612e0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ upstream_git/0045-ContactIndexer-Port-to-the-Baloo-Xapian-library.patch
 upstream_git/0046-Runner-Use-the-Baloo-icon.patch
 upstream_git/0047-XapianSearchStore-Catch-some-more-exceptions.patch
 upstream_git/0048-SVN_SILENT-made-messages-.desktop-file.patch
+upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch
diff --git a/debian/patches/upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch b/debian/patches/upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch
new file mode 100644
index 0000000..4ed1ff8
--- /dev/null
+++ b/debian/patches/upstream_git/0049-XapianDatabase-Catch-more-exceptions.patch
@@ -0,0 +1,61 @@
+From 707f61f3c4134b64bdd923cf4dc5199219b79c01 Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me at vhanda.in>
+Date: Mon, 7 Apr 2014 18:20:21 +0200
+Subject: [PATCH 49/51] XapianDatabase: Catch more exceptions
+
+BUG: 332403
+---
+ src/xapian/xapiandatabase.cpp | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/xapian/xapiandatabase.cpp b/src/xapian/xapiandatabase.cpp
+index a509731..2fda1de 100644
+--- a/src/xapian/xapiandatabase.cpp
++++ b/src/xapian/xapiandatabase.cpp
+@@ -62,7 +62,11 @@ void XapianDatabase::replaceDocument(uint id, const XapianDocument& doc)
+ void XapianDatabase::replaceDocument(uint id, const Xapian::Document& doc)
+ {
+     if (m_writeOnly) {
+-        m_wDb.replace_document(id, doc);
++        try {
++            m_wDb.replace_document(id, doc);
++        }
++        catch (const Xapian::Error&) {
++        }
+         return;
+     }
+     m_docsToAdd << qMakePair(id, doc);
+@@ -74,7 +78,7 @@ void XapianDatabase::deleteDocument(uint id)
+         try {
+             m_wDb.delete_document(id);
+         }
+-        catch (const Xapian::DocNotFoundError&) {
++        catch (const Xapian::Error&) {
+         }
+         return;
+     }
+@@ -96,7 +100,11 @@ void XapianDatabase::commit()
+ 
+     kDebug() << "Adding:" << m_docsToAdd.size() << "docs";
+     Q_FOREACH (const DocIdPair& doc, m_docsToAdd) {
+-        wdb.replace_document(doc.first, doc.second);
++        try {
++            wdb.replace_document(doc.first, doc.second);
++        }
++        catch (const Xapian::Error&) {
++        }
+     }
+ 
+     kDebug() << "Removing:" << m_docsToRemove.size() << "docs";
+@@ -104,7 +112,7 @@ void XapianDatabase::commit()
+         try {
+             wdb.delete_document(id);
+         }
+-        catch (const Xapian::DocNotFoundError&) {
++        catch (const Xapian::Error&) {
+         }
+     }
+ 
+-- 
+1.9.1
+

-- 
baloo packaging