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

Maximiliano Curia maxy at moszumanska.debian.org
Wed Jan 8 19:50:55 UTC 2014


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

The following commit has been merged in the master branch:
commit 1d3d679f24446782472845c6e83a1e36b74b88fc
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 8 15:36:03 2014 -0300

    Remove patch: disable_dbus_requiring_tests.diff
---
 debian/patches/disable_dbus_requiring_tests.diff | 50 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/disable_dbus_requiring_tests.diff b/debian/patches/disable_dbus_requiring_tests.diff
deleted file mode 100644
index 16392d3..0000000
--- a/debian/patches/disable_dbus_requiring_tests.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Disable tests which require active DBus
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-08-30
-
-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
-
-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)
- 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(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(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)
diff --git a/debian/patches/series b/debian/patches/series
index f100291..64c8dfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-# disable_dbus_requiring_tests.diff
 dont_do_redundant_flag_changes.diff
 always_verify_writing_data_to_external_file.diff

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list