[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-17-gf4eebce

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=f4eebce

The following commit has been merged in the kubuntu_vivid_archive branch:
commit f4eebcef3f74df4779cdabfe2e23abdb1a9ee518
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Mar 19 13:14:36 2015 +0100

    Add kubuntu_disable-failing-test.diff to disable test failing due to test environment favicontest
---
 debian/changelog                                 |  7 +++++++
 debian/patches/kubuntu_disable-failing-test.diff | 18 ++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e35184b..1a80aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-baseapps (4:14.12.3-0ubuntu2) vivid; urgency=medium
+
+  * Add kubuntu_disable-failing-test.diff to disable test failing due to
+    test environment favicontest
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 19 Mar 2015 13:11:37 +0100
+
 kde-baseapps (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_disable-failing-test.diff b/debian/patches/kubuntu_disable-failing-test.diff
new file mode 100644
index 0000000..e50df7c
--- /dev/null
+++ b/debian/patches/kubuntu_disable-failing-test.diff
@@ -0,0 +1,18 @@
+Index: kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
+===================================================================
+--- kde-baseapps-14.12.3.orig/lib/konq/tests/CMakeLists.txt
++++ kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
+@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
+ target_link_libraries(konqpopupmenutest konq ${KDE4_KFILE_LIBS}
+                      ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
+ 
+-########### favicontest ###############
+-
+-set(favicontest_SRCS favicontest.cpp)
+-qt4_add_dbus_interface(favicontest_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../favicons/org.kde.FavIcon.xml favicon_interface)
+-kde4_add_unit_test(favicontest ${favicontest_SRCS})
+-
+-target_link_libraries(favicontest konq ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBRARY} ${QT_QTCORE_LIBRARY}
+-                      ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY})
+-
+ ############################################
diff --git a/debian/patches/series b/debian/patches/series
index 8040b9d..289e6d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ enable_dlrestrictions.diff
 kubuntu_folderview_livecd_directory.diff
 kubuntu_folderwidget_drawing.diff
 kubuntu_install_flash.diff
+kubuntu_disable-failing-test.diff

-- 
KDE Base Applications module packaging