[SCM] baloo packaging branch, master, updated. debian/4.13.1-1-24-ga23a630

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 80bca8103f3f33f43bda148888c63445461f9a53
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Tue Apr 15 11:47:46 2014 +0200

    Add upstream_catch_more_exceptions_emailsearchstore.patch from upstream
    expanding the exception catching to prevent krunner crashes on random
    searches
---
 debian/changelog                                            |  8 ++++++++
 debian/patches/series                                       |  1 +
 .../upstream_catch_more_exceptions_emailsearchstore.patch   | 13 +++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f1298e2..e5a5fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+baloo (4:4.13.0-0ubuntu2) trusty; urgency=medium
+
+  * Add upstream_catch_more_exceptions_emailsearchstore.patch from upstream
+    expanding the exception catching to prevent krunner crashes on random
+    searches
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 15 Apr 2014 11:45:50 +0200
+
 baloo (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c9ba037 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_catch_more_exceptions_emailsearchstore.patch
diff --git a/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch b/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch
new file mode 100644
index 0000000..e0cf3b1
--- /dev/null
+++ b/debian/patches/upstream_catch_more_exceptions_emailsearchstore.patch
@@ -0,0 +1,13 @@
+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