[SCM] Akonadi packaging branch, master, updated. debian/1.7.2-1

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 41ba381c031ee6343f923ed6e26b628243a2f8da
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 12 22:54:34 2012 +0300

    Disable tests which require an active DBus daemon.
    
    DBus daemon is not available on buildds.
    (patch disable_dbus_requiring_tests.diff)
---
 debian/changelog                                 |    2 +
 debian/patches/disable_dbus_requiring_tests.diff |   35 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 3 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efff4fc..f734e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ akonadi (1.7.2-0r1) UNRELEASED; urgency=low
   * New upstream release.
   * Drop x11_not_required.diff, no longer needed as internal FindQt4 was
     dropped.
+  * Disable tests which require an active DBus daemon. It is not available on
+    buildds (patch disable_dbus_requiring_tests.diff).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 12 May 2012 22:31:34 +0300
 
diff --git a/debian/patches/disable_dbus_requiring_tests.diff b/debian/patches/disable_dbus_requiring_tests.diff
new file mode 100644
index 0000000..ded799d
--- /dev/null
+++ b/debian/patches/disable_dbus_requiring_tests.diff
@@ -0,0 +1,35 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Disable tests which require active DBus
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2012-05-12
+
+The following tests need active DBus daemon at the moment. Disable them.
+
+- akonadi-imapstreamparsertest
+- akonadi-akdbustest
+- akonadi-akstandarddirstest
+- akonadi-handlertest
+- akonadi-dbconfigtest
+
+--- a/server/tests/unittest/CMakeLists.txt
++++ b/server/tests/unittest/CMakeLists.txt
+@@ -18,13 +18,13 @@ macro(add_server_test _source _libs)
+   endif (AKONADI_STATIC_SQLITE)
+ endmacro(add_server_test)
+ 
+-add_server_test(imapstreamparsertest.cpp akonadiprivate)
++#add_server_test(imapstreamparsertest.cpp akonadiprivate)
+ add_server_test(scopetest.cpp akonadiprivate)
+ add_server_test(handlerhelpertest.cpp akonadiprivate)
+ add_server_test(querybuildertest.cpp akonadiprivate)
+ add_server_test(dbinitializertest.cpp akonadiprivate)
+ add_server_test(dbupdatertest.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(akdbustest.cpp akonadiprivate)
++#add_server_test(akstandarddirstest.cpp akonadiprivate)
++#add_server_test(handlertest.cpp akonadiprivate)
++#add_server_test(dbconfigtest.cpp akonadiprivate)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7356dd1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_dbus_requiring_tests.diff

-- 
Akonadi packaging