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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit da0df90a472485bc166cf3aba23781974d05373b
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Feb 7 01:04:17 2013 +0100

    Update disable_dbus_requiring_tests.diff.
---
 debian/changelog                                 |    4 ++++
 debian/patches/disable_dbus_requiring_tests.diff |   17 ++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 573e05f..6d64b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ akonadi (1.9.0-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ José Manuel Santamaría Lema ]
+  * Update disable_dbus_requiring_tests.diff; some tests were added and
+    some of them need D-Bus.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Nov 2012 07:41:00 +0100
 
 akonadi (1.7.2-2) UNRELEASED; urgency=low
diff --git a/debian/patches/disable_dbus_requiring_tests.diff b/debian/patches/disable_dbus_requiring_tests.diff
index ded799d..08c9a16 100644
--- a/debian/patches/disable_dbus_requiring_tests.diff
+++ b/debian/patches/disable_dbus_requiring_tests.diff
@@ -2,19 +2,23 @@ From: Modestas Vainius <modax at debian.org>
 Subject: Disable tests which require active DBus
 Origin: vendor
 Forwarded: not-needed
-Last-Update: 2012-05-12
+Last-Update: 2013-02-07
 
 The following tests need active DBus daemon at the moment. Disable them.
 
 - akonadi-imapstreamparsertest
+- akonadi-dbtypetest
+- akonadi-dbintrospectortest
+- akonadi-dbinitializertest
 - akonadi-akdbustest
 - akonadi-akstandarddirstest
 - akonadi-handlertest
 - akonadi-dbconfigtest
+- akonadi-parthelpertest
 
 --- a/server/tests/unittest/CMakeLists.txt
 +++ b/server/tests/unittest/CMakeLists.txt
-@@ -18,13 +18,13 @@ macro(add_server_test _source _libs)
+@@ -18,16 +18,16 @@ macro(add_server_test _source _libs)
    endif (AKONADI_STATIC_SQLITE)
  endmacro(add_server_test)
  
@@ -22,14 +26,21 @@ The following tests need active DBus daemon at the moment. Disable them.
 +#add_server_test(imapstreamparsertest.cpp akonadiprivate)
  add_server_test(scopetest.cpp akonadiprivate)
  add_server_test(handlerhelpertest.cpp akonadiprivate)
+-add_server_test(dbtypetest.cpp akonadiprivate)
+-add_server_test(dbintrospectortest.cpp akonadiprivate)
++#add_server_test(dbtypetest.cpp akonadiprivate)
++#add_server_test(dbintrospectortest.cpp akonadiprivate)
  add_server_test(querybuildertest.cpp akonadiprivate)
- add_server_test(dbinitializertest.cpp akonadiprivate)
+-add_server_test(dbinitializertest.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(parthelpertest.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)

-- 
Akonadi packaging