[SCM] KDevelop packaging branch, master, updated. debian/4.5.1-1-6-g8844c3b

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 6bb982cd7614e56798323acebdfa934ea46b3c52
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Apr 27 12:24:24 2013 +0200

    Refresh patch fix-parallel.diff.
---
 debian/patches/fix-parallel.diff |   26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/patches/fix-parallel.diff b/debian/patches/fix-parallel.diff
index e810d89..272d92c 100644
--- a/debian/patches/fix-parallel.diff
+++ b/debian/patches/fix-parallel.diff
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- a/languages/cpp/CMakeLists.txt
 +++ b/languages/cpp/CMakeLists.txt
-@@ -27,7 +27,6 @@
+@@ -11,7 +11,6 @@ add_definitions( -DKDE_DEFAULT_DEBUG_ARE
  
  add_subdirectory(parser)
  add_subdirectory(cppduchain)
@@ -16,7 +16,7 @@ Forwarded: no
  ########### next target ###############
  
  set(kdevcpplanguagesupport_PART_SRCS
-@@ -102,6 +101,7 @@
+@@ -90,6 +89,7 @@ target_link_libraries(kdevcpplanguagesup
  
  install(TARGETS kdevcpplanguagesupport DESTINATION ${PLUGIN_INSTALL_DIR})
  
@@ -26,7 +26,7 @@ Forwarded: no
  
 --- a/languages/cpp/tests/CMakeLists.txt
 +++ b/languages/cpp/tests/CMakeLists.txt
-@@ -67,6 +67,7 @@
+@@ -83,6 +83,7 @@ target_link_libraries(cppspecialcompleti
      ${KDEVPLATFORM_PROJECT_LIBRARIES}
      ${KDEVPLATFORM_TESTS_LIBRARIES}
  )
@@ -34,7 +34,23 @@ Forwarded: no
  
  ########### next target ###############
  
-@@ -99,6 +100,7 @@
+@@ -103,7 +104,6 @@ target_link_libraries(cppassistantstest
+     kdev4cppduchain
+     kdev4cpprpp
+     kdev4cppparser
+-    kdevcpplanguagesupport
+     ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+     ${KDEVPLATFORM_PROJECT_LIBRARIES}
+     ${KDE4_THREADWEAVER_LIBRARIES}
+@@ -112,6 +112,7 @@ target_link_libraries(cppassistantstest
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KTEXTEDITOR_LIBS}
+ )
++add_dependencies(cppassistantstest kdevcpplanguagesupport)
+ 
+ add_definitions(-DTEST_COMPLETION)
+ 
+@@ -143,6 +144,7 @@ target_link_libraries(cppcodecompletiont
      ${KDE4_KDECORE_LIBS}
      ${KDE4_KTEXTEDITOR_LIBS}
  )
@@ -42,7 +58,7 @@ Forwarded: no
  
  kde4_add_unit_test(cppcodegentest ${cppcodegentest_SRCS})
  target_link_libraries(cppcodegentest
-@@ -111,6 +113,7 @@
+@@ -155,6 +157,7 @@ target_link_libraries(cppcodegentest
      ${KDEVPLATFORM_PROJECT_LIBRARIES}
      ${KDEVPLATFORM_TESTS_LIBRARIES}
  )

-- 
KDevelop packaging