[SCM] muon packaging branch, gsoc-floris-2014, updated. 961b945e81b41bc407847424bf310de1fe450f9c

[Floris-Andrei Stoica-Marcu]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=103ff89

The following commit has been merged in the gsoc-floris-2014 branch:
commit 103ff89dcfb77ecc04404738745b3f3e9111bf0f
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date:   Tue Jul 15 05:06:37 2014 +0300

    Enabled tests again
---
 debian/patches/disabled_tests.diff | 33 ---------------------------------
 debian/patches/series              |  2 --
 2 files changed, 35 deletions(-)

diff --git a/debian/patches/disabled_tests.diff b/debian/patches/disabled_tests.diff
deleted file mode 100644
index 25a28da..0000000
--- a/debian/patches/disabled_tests.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt
-+++ b/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt
-@@ -9,5 +9,5 @@
-         ${KDE4_KIO_LIBS} ${QAPT_LIBRARY})
- endmacro(libmuon_add_unit_test)
- 
--libmuon_add_unit_test(applicationbackendtest ApplicationBackendTest.cpp)
--libmuon_add_unit_test(reviewstest ReviewsTest.cpp)
-+#libmuon_add_unit_test(applicationbackendtest ApplicationBackendTest.cpp)
-+#libmuon_add_unit_test(reviewstest ReviewsTest.cpp)
---- a/libmuon/backends/KNSBackend/tests/CMakeLists.txt
-+++ b/libmuon/backends/KNSBackend/tests/CMakeLists.txt
-@@ -1,8 +1,8 @@
- include_directories(..)
- 
--kde4_add_unit_test(knsbackendtest KNSBackendTest.cpp)
-+#kde4_add_unit_test(knsbackendtest KNSBackendTest.cpp)
- target_link_libraries(knsbackendtest
--    muonprivate
-+    #muonprivate2
-     
-     ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}
-     ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KIO_LIBS} ${LIBATTICA_LIBRARIES}
---- a/libmuon/backends/KNSBackend/CMakeLists.txt
-+++ b/libmuon/backends/KNSBackend/CMakeLists.txt
-@@ -1,6 +1,6 @@
- include_directories(${LIBATTICA_INCLUDE_DIR})
- 
--add_subdirectory(tests)
-+#add_subdirectory(tests)
- 
- set(knsbackend_SRCS
-     KNSBackend.cpp
diff --git a/debian/patches/series b/debian/patches/series
index be0a3e1..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-
-disabled_tests.diff

-- 
muon packaging