[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-1-8-g1ea4e6a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=09f414a

The following commit has been merged in the master branch:
commit 09f414a5c33a91c9f52e547248ab4325e2f07e89
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 19 10:57:55 2014 +0200

    New upstream patch: upstream_dont_call_insert_from_Q_ASSERT
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 +
 .../upstream_dont_call_insert_from_Q_ASSERT        | 30 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 46bfe3c..7e63223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ akonadi (1.13.0-2) UNRELEASED; urgency=medium
   * New upstream patch: upstream-
     do_not_crash_when_setmntent_returns_NULL
   * Update symbols files from buildds logs (1.13.0-1).
+  * New upstream patch: upstream_dont_call_insert_from_Q_ASSERT
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Sep 2014 14:39:41 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 4d90184..ff22ffc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 upstream-fix_typo_in_if_condition
 upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
 upstream-do_not_crash_when_setmntent_returns_NULL
+upstream_dont_call_insert_from_Q_ASSERT
diff --git a/debian/patches/upstream_dont_call_insert_from_Q_ASSERT b/debian/patches/upstream_dont_call_insert_from_Q_ASSERT
new file mode 100644
index 0000000..80ebae9
--- /dev/null
+++ b/debian/patches/upstream_dont_call_insert_from_Q_ASSERT
@@ -0,0 +1,30 @@
+commit c516ec5c28d603aea0df6165f66a3a5d0a0191c4
+Author: Dan Vrátil <dvratil at redhat.com>
+Date:   Fri Sep 19 10:50:23 2014 +0200
+
+    Don't call insert() from Q_ASSERT - breaks unit-tests in Release mode
+
+diff --git a/server/tests/unittest/collectionreferencetest.cpp b/server/tests/unittest/collectionreferencetest.cpp
+index 1700c75..1b10c55 100644
+--- a/server/tests/unittest/collectionreferencetest.cpp
++++ b/server/tests/unittest/collectionreferencetest.cpp
+@@ -45,7 +45,8 @@ public:
+         Resource res;
+         res.setId(1);
+         res.setName(QLatin1String(name));
+-        Q_ASSERT(res.insert());
++        const bool success = res.insert();
++        Q_ASSERT(success);
+         mResource = res;
+         return res;
+     }
+@@ -57,7 +58,8 @@ public:
+         col.setName(QLatin1String(name));
+         col.setRemoteId(QLatin1String(name));
+         col.setResource(mResource);
+-        Q_ASSERT(col.insert());
++        const bool success = col.insert();
++        Q_ASSERT(success);
+         return col;
+     }
+ 

-- 
Akonadi packaging