[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 1 07:57:33 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=db2ba0b

The following commit has been merged in the master branch:
commit db2ba0bcdfe640b3397a8a602dbfe342c54bbf41
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue May 20 18:03:46 2014 +0200

    New patch: disable_tests_depending_on_revdep
---
 debian/changelog                                 |   1 +
 debian/patches/disable_tests_depending_on_revdep | 122 +++++++++++++++++++++++
 debian/patches/series                            |   1 +
 3 files changed, 124 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 04d0bf2..f4d5e34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,6 @@ baloo (4:4.13.1-1~) UNRELEASED; urgency=medium
   * Initial release, based on the kubuntu package.
   * Update build dependencies.
   * Update symbols files.
+  * New patch: disable_tests_depending_on_revdep
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 14 May 2014 13:23:13 +0200
diff --git a/debian/patches/disable_tests_depending_on_revdep b/debian/patches/disable_tests_depending_on_revdep
new file mode 100644
index 0000000..f01e8bd
--- /dev/null
+++ b/debian/patches/disable_tests_depending_on_revdep
@@ -0,0 +1,122 @@
+Index: baloo/src/pim/agent/autotests/CMakeLists.txt
+===================================================================
+--- baloo.orig/src/pim/agent/autotests/CMakeLists.txt	2014-05-20 17:59:58.781066129 +0200
++++ baloo/src/pim/agent/autotests/CMakeLists.txt	2014-05-20 18:02:39.430773398 +0200
+@@ -2,29 +2,29 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/..
+ )
+ 
+-set(indexertest_SRCS
+-    indexertest.cpp
+-    ../emailindexer.cpp
+-    ../contactindexer.cpp
+-    ../abstractindexer.cpp
+-    ../../search/pimsearchstore.cpp
+-    ../../search/email/emailsearchstore.cpp
+-    ../../search/email/agepostingsource.cpp
+-    ../../search/contact/contactsearchstore.cpp
+-)
++# set(indexertest_SRCS
++#     indexertest.cpp
++#     ../emailindexer.cpp
++#     ../contactindexer.cpp
++#     ../abstractindexer.cpp
++#     ../../search/pimsearchstore.cpp
++#     ../../search/email/emailsearchstore.cpp
++#     ../../search/email/agepostingsource.cpp
++#     ../../search/contact/contactsearchstore.cpp
++# )
+ 
+-add_definitions(-DBALOO_NO_PLUGINS=TRUE)
++# add_definitions(-DBALOO_NO_PLUGINS=TRUE)
+ 
+-kde4_add_unit_test(indexertest NOGUI ${indexertest_SRCS})
+-target_link_libraries(indexertest
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDE4_KDECORE_LIBS}
+-    ${KDEPIMLIBS_AKONADI_LIBS}
+-    ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+-    ${KDEPIMLIBS_KMIME_LIBS}
+-    ${KDEPIMLIBS_KABC_LIBS}
+-    ${XAPIAN_LIBRARIES}
+-    ${KDEPIMLIBS_KPIMUTILS_LIBS}
+-    baloocore
+-    balooxapian
+-)
++# kde4_add_unit_test(indexertest NOGUI ${indexertest_SRCS})
++# target_link_libraries(indexertest
++#     ${QT_QTTEST_LIBRARY}
++#     ${KDE4_KDECORE_LIBS}
++#     ${KDEPIMLIBS_AKONADI_LIBS}
++#     ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
++#     ${KDEPIMLIBS_KMIME_LIBS}
++#     ${KDEPIMLIBS_KABC_LIBS}
++#     ${XAPIAN_LIBRARIES}
++#     ${KDEPIMLIBS_KPIMUTILS_LIBS}
++#     baloocore
++#     balooxapian
++# )
+Index: baloo/src/pim/akonadiplugin/autotests/CMakeLists.txt
+===================================================================
+--- baloo.orig/src/pim/akonadiplugin/autotests/CMakeLists.txt	2014-05-20 17:59:58.781066129 +0200
++++ baloo/src/pim/akonadiplugin/autotests/CMakeLists.txt	2014-05-20 18:02:56.826091845 +0200
+@@ -2,32 +2,32 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/..
+ )
+ 
+-set(searchplugintest_SRCS
+-    searchplugintest.cpp
+-    ../searchplugin.cpp
+-    ../../agent/emailindexer.cpp
+-    ../../agent/contactindexer.cpp
+-    ../../agent/abstractindexer.cpp
+-    ../../agent/akonotesindexer.cpp
+-    ../../search/pimsearchstore.cpp
+-    ../../search/email/emailsearchstore.cpp
+-    ../../search/email/agepostingsource.cpp
+-    ../../search/contact/contactsearchstore.cpp
+-    ../../search/note/notesearchstore.cpp
+-)
++# set(searchplugintest_SRCS
++#     searchplugintest.cpp
++#     ../searchplugin.cpp
++#     ../../agent/emailindexer.cpp
++#     ../../agent/contactindexer.cpp
++#     ../../agent/abstractindexer.cpp
++#     ../../agent/akonotesindexer.cpp
++#     ../../search/pimsearchstore.cpp
++#     ../../search/email/emailsearchstore.cpp
++#     ../../search/email/agepostingsource.cpp
++#     ../../search/contact/contactsearchstore.cpp
++#     ../../search/note/notesearchstore.cpp
++# )
+ 
+-add_definitions(-DBALOO_NO_PLUGINS=TRUE)
++# add_definitions(-DBALOO_NO_PLUGINS=TRUE)
+ 
+-kde4_add_unit_test(searchplugintest NOGUI ${searchplugintest_SRCS})
+-target_link_libraries(searchplugintest
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDE4_KDECORE_LIBS}
+-    ${KDEPIMLIBS_AKONADI_LIBS}
+-    ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+-    ${KDEPIMLIBS_KMIME_LIBS}
+-    ${KDEPIMLIBS_KABC_LIBS}
+-    ${XAPIAN_LIBRARIES}
+-    ${KDEPIMLIBS_KPIMUTILS_LIBS}
+-    baloocore
+-    balooxapian
+-)
++# kde4_add_unit_test(searchplugintest NOGUI ${searchplugintest_SRCS})
++# target_link_libraries(searchplugintest
++#     ${QT_QTTEST_LIBRARY}
++#     ${KDE4_KDECORE_LIBS}
++#     ${KDEPIMLIBS_AKONADI_LIBS}
++#     ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
++#     ${KDEPIMLIBS_KMIME_LIBS}
++#     ${KDEPIMLIBS_KABC_LIBS}
++#     ${XAPIAN_LIBRARIES}
++#     ${KDEPIMLIBS_KPIMUTILS_LIBS}
++#     baloocore
++#     balooxapian
++# )
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fd393f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_tests_depending_on_revdep

-- 
baloo packaging



More information about the pkg-kde-commits mailing list