[SCM] KDevelop packaging branch, master, updated. debian/4.5.2-1-16-g9893dc4

[Andreas Cord-Landwehr]

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

The following commit has been merged in the master branch:
commit 784186e0cb569908de3eb99103a57fa03fa95239
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Aug 30 11:05:10 2014 +0200

    Refresh patches.
---
 debian/changelog                 |  1 +
 debian/patches/fix-parallel.diff | 20 ++++++--------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e643c1e..d6e6d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdevelop (4:4.7.0-0r1) UNRELEASED; urgency=medium
 
   [ Andreas Cord-Landwehr ]
   * Bump kdevplatform-dev build dependency to 1.7.0.
+  * Refresh patches.
 
   [ Pino Toscano ]
   * Update copyright.
diff --git a/debian/patches/fix-parallel.diff b/debian/patches/fix-parallel.diff
index 272d92c..39ebe21 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
-@@ -11,7 +11,6 @@ add_definitions( -DKDE_DEFAULT_DEBUG_ARE
+@@ -11,7 +11,6 @@
  
  add_subdirectory(parser)
  add_subdirectory(cppduchain)
@@ -16,7 +16,7 @@ Forwarded: no
  ########### next target ###############
  
  set(kdevcpplanguagesupport_PART_SRCS
-@@ -90,6 +89,7 @@ target_link_libraries(kdevcpplanguagesup
+@@ -81,6 +80,7 @@
  
  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
-@@ -83,6 +83,7 @@ target_link_libraries(cppspecialcompleti
+@@ -87,6 +87,7 @@
      ${KDEVPLATFORM_PROJECT_LIBRARIES}
      ${KDEVPLATFORM_TESTS_LIBRARIES}
  )
@@ -34,15 +34,7 @@ Forwarded: no
  
  ########### next target ###############
  
-@@ -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
+@@ -111,6 +112,7 @@
      ${KDE4_KDECORE_LIBS}
      ${KDE4_KTEXTEDITOR_LIBS}
  )
@@ -50,7 +42,7 @@ Forwarded: no
  
  add_definitions(-DTEST_COMPLETION)
  
-@@ -143,6 +144,7 @@ target_link_libraries(cppcodecompletiont
+@@ -147,6 +149,7 @@
      ${KDE4_KDECORE_LIBS}
      ${KDE4_KTEXTEDITOR_LIBS}
  )
@@ -58,7 +50,7 @@ Forwarded: no
  
  kde4_add_unit_test(cppcodegentest ${cppcodegentest_SRCS})
  target_link_libraries(cppcodegentest
-@@ -155,6 +157,7 @@ target_link_libraries(cppcodegentest
+@@ -159,6 +162,7 @@
      ${KDEVPLATFORM_PROJECT_LIBRARIES}
      ${KDEVPLATFORM_TESTS_LIBRARIES}
  )

-- 
KDevelop packaging