[SCM] muon packaging branch, master, updated. 0222d0fd919bfa472006ffaff6953ea39fbecb8e

[José Manuel Santamaría Lema]

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

The following commit has been merged in the master branch:
commit 733a1aeba2dc62acb916b54f0bcfc4d7b5c0f786
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Sep 7 21:40:48 2012 +0200

    Add disable_tests_building.diff.
---
 debian/patches/disable_tests_building.diff |   22 ++++++++++++++++++++++
 debian/patches/series                      |    1 +
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/patches/disable_tests_building.diff b/debian/patches/disable_tests_building.diff
new file mode 100644
index 0000000..ff0703e
--- /dev/null
+++ b/debian/patches/disable_tests_building.diff
@@ -0,0 +1,22 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Description: This patch disables the tests building, avoiding an ftbfs (because
+ the rating support is disabled in other patch).
+--- a/discover/CMakeLists.txt
++++ b/discover/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_subdirectory(tests)
++#add_subdirectory(tests)
+ add_subdirectory(icons)
+ 
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libmuon ${CMAKE_CURRENT_BINARY_DIR}/..)
+--- a/libmuon/CMakeLists.txt
++++ b/libmuon/CMakeLists.txt
+@@ -22,7 +22,7 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _i
+ 
+ ENDMACRO(QT4_ADD_DBUS_INTERFACE)
+ 
+-add_subdirectory(tests)
++#add_subdirectory(tests)
+ 
+ set(muon_LIB_SRCS
+     Application.cpp
diff --git a/debian/patches/series b/debian/patches/series
index e56492f..c2a252a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove_canonical_support_info.diff
 hide_changelog_tab.diff
 remove_reviews_section.diff
 list_properly_unofficial_sw_sources.diff
+disable_tests_building.diff

-- 
muon packaging