[SCM] Akonadi packaging branch, experimental, updated. debian/1.9.2-2-6-g7047563

[Maximiliano Curia]

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

The following commit has been merged in the experimental branch:
commit 59c2356350144ece3ccd29bd532b47831bd448b7
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Aug 30 13:19:45 2013 +0200

    Refresh patch disable_dbus_requiring_tests.
---
 debian/changelog                                 |    1 +
 debian/patches/disable_dbus_requiring_tests.diff |   16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2dd58d..6298ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 akonadi (1.10.2-1) UNRELEASED; urgency=low
 
   * Update vcs-fields.
+  * Refresh patch disable_dbus_requiring_tests.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Aug 2013 12:42:10 +0200
 
diff --git a/debian/patches/disable_dbus_requiring_tests.diff b/debian/patches/disable_dbus_requiring_tests.diff
index 08c9a16..16392d3 100644
--- a/debian/patches/disable_dbus_requiring_tests.diff
+++ b/debian/patches/disable_dbus_requiring_tests.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax at debian.org>
 Subject: Disable tests which require active DBus
 Origin: vendor
 Forwarded: not-needed
-Last-Update: 2013-02-07
+Last-Update: 2013-08-30
 
 The following tests need active DBus daemon at the moment. Disable them.
 
@@ -16,11 +16,13 @@ The following tests need active DBus daemon at the moment. Disable them.
 - akonadi-dbconfigtest
 - akonadi-parthelpertest
 
---- a/server/tests/unittest/CMakeLists.txt
-+++ b/server/tests/unittest/CMakeLists.txt
-@@ -18,16 +18,16 @@ macro(add_server_test _source _libs)
-   endif (AKONADI_STATIC_SQLITE)
- endmacro(add_server_test)
+Index: akonadi-1.10.2/server/tests/unittest/CMakeLists.txt
+===================================================================
+--- akonadi-1.10.2.orig/server/tests/unittest/CMakeLists.txt	2013-08-30 13:37:27.067938713 +0200
++++ akonadi-1.10.2/server/tests/unittest/CMakeLists.txt	2013-08-30 13:39:31.370954188 +0200
+@@ -19,17 +19,17 @@
+   endif()
+ endmacro()
  
 -add_server_test(imapstreamparsertest.cpp akonadiprivate)
 +#add_server_test(imapstreamparsertest.cpp akonadiprivate)
@@ -39,8 +41,10 @@ The following tests need active DBus daemon at the moment. Disable them.
 -add_server_test(handlertest.cpp akonadiprivate)
 -add_server_test(dbconfigtest.cpp akonadiprivate)
 -add_server_test(parthelpertest.cpp akonadiprivate)
+-add_server_test(clientcapabilityaggregatortest.cpp akonadiprivate)
 +#add_server_test(akdbustest.cpp akonadiprivate)
 +#add_server_test(akstandarddirstest.cpp akonadiprivate)
 +#add_server_test(handlertest.cpp akonadiprivate)
 +#add_server_test(dbconfigtest.cpp akonadiprivate)
 +#add_server_test(parthelpertest.cpp akonadiprivate)
++#add_server_test(clientcapabilityaggregatortest.cpp akonadiprivate)

-- 
Akonadi packaging