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

The following commit has been merged in the master branch:
commit f79201cc1ab0fe23496a7a79d8edb899aeebffff
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed Jun 18 12:16:33 2014 +0100

    Remove upstream_catch_more_exceptions_emailsearchstore.patch
    fixed upstream
---
 debian/changelog                                            |  2 ++
 debian/patches/series                                       |  1 -
 .../upstream_catch_more_exceptions_emailsearchstore.patch   | 13 -------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1551046..74ac5a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 baloo (4:4.13.2-0ubuntu1) UNRELEASED; urgency=medium
 
   * new upstream release
+  * Remove upstream_catch_more_exceptions_emailsearchstore.patch
+    fixed upstream
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:38:20 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0ddfa30..fd393f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_tests_depending_on_revdep
-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
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