[SCM] KDevelop packaging branch, master, updated. debian/4.3.1-2-2-g8fa5082

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=8fa5082

The following commit has been merged in the master branch:
commit 8fa50821218a0a36b15834ec59cf40a01028decb
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 21 12:51:27 2012 +0200

    fix parallel building
---
 debian/changelog                 |    2 +
 debian/patches/fix-parallel.diff |   52 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9f6d25..8c49af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdevelop (4:4.3.1-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix parallel building; patch fix-parallel.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 May 2012 12:43:46 +0200
 
diff --git a/debian/patches/fix-parallel.diff b/debian/patches/fix-parallel.diff
new file mode 100644
index 0000000..e810d89
--- /dev/null
+++ b/debian/patches/fix-parallel.diff
@@ -0,0 +1,52 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix parallel building of tests
+ Set the proper dependency on the kdevcpplanguagesupport target on few tests;
+ since they compile the sources of kdevcpplanguagesupport which include sources
+ (like ui_*.h files) generated during the build of kdevcpplanguagesupport.
+Last-Update: 2012-05-21
+Forwarded: no
+
+--- a/languages/cpp/CMakeLists.txt
++++ b/languages/cpp/CMakeLists.txt
+@@ -27,7 +27,6 @@
+ 
+ add_subdirectory(parser)
+ add_subdirectory(cppduchain)
+-add_subdirectory(tests)
+ ########### next target ###############
+ 
+ set(kdevcpplanguagesupport_PART_SRCS
+@@ -102,6 +101,7 @@
+ 
+ install(TARGETS kdevcpplanguagesupport DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
++add_subdirectory(tests)
+ 
+ ########### install files ###############
+ 
+--- a/languages/cpp/tests/CMakeLists.txt
++++ b/languages/cpp/tests/CMakeLists.txt
+@@ -67,6 +67,7 @@
+     ${KDEVPLATFORM_PROJECT_LIBRARIES}
+     ${KDEVPLATFORM_TESTS_LIBRARIES}
+ )
++add_dependencies(cppspecialcompletion kdevcpplanguagesupport)
+ 
+ ########### next target ###############
+ 
+@@ -99,6 +100,7 @@
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KTEXTEDITOR_LIBS}
+ )
++add_dependencies(cppcodecompletiontest kdevcpplanguagesupport)
+ 
+ kde4_add_unit_test(cppcodegentest ${cppcodegentest_SRCS})
+ target_link_libraries(cppcodegentest
+@@ -111,6 +113,7 @@
+     ${KDEVPLATFORM_PROJECT_LIBRARIES}
+     ${KDEVPLATFORM_TESTS_LIBRARIES}
+ )
++add_dependencies(cppcodegentest kdevcpplanguagesupport)
+ 
+ kde4_add_executable( cpp-parser cpp-parser.cpp )
+ target_link_libraries(cpp-parser
diff --git a/debian/patches/series b/debian/patches/series
index 3d7680d..38d171b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 okteta_optional_structures_tool.diff
+fix-parallel.diff

-- 
KDevelop packaging