[SCM] KDevelop packaging branch, experimental, updated. debian/4.7.3-3-14-gbfa2d58
Pino Toscano
pino at moszumanska.debian.org
Fri Aug 26 05:35:16 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=7e52f68
The following commit has been merged in the experimental branch:
commit 7e52f68e1c847ee1d375e9da197745f1ea7f8e11
Author: Pino Toscano <pino at debian.org>
Date: Fri Aug 26 07:11:11 2016 +0200
update the patches
- fix-parallel.diff: drop, no more needed
---
debian/changelog | 2 ++
debian/patches/fix-parallel.diff | 60 ----------------------------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8f0100c..e94ce08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ kdevelop (4:5.0-0r1) UNRELEASED; urgency=medium
* Use the right dh addon:
- switch from kde to kf5 dh addon
- bump the pkg-kde-tools build dependency to >= 0.15.16
+ * Update the patches:
+ - fix-parallel.diff: drop, no more needed
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 26 Aug 2016 06:08:47 +0200
diff --git a/debian/patches/fix-parallel.diff b/debian/patches/fix-parallel.diff
deleted file mode 100644
index 39ebe21..0000000
--- a/debian/patches/fix-parallel.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-@@ -11,7 +11,6 @@
-
- add_subdirectory(parser)
- add_subdirectory(cppduchain)
--add_subdirectory(tests)
- ########### next target ###############
-
- set(kdevcpplanguagesupport_PART_SRCS
-@@ -81,6 +80,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
-@@ -87,6 +87,7 @@
- ${KDEVPLATFORM_PROJECT_LIBRARIES}
- ${KDEVPLATFORM_TESTS_LIBRARIES}
- )
-+add_dependencies(cppspecialcompletion kdevcpplanguagesupport)
-
- ########### next target ###############
-
-@@ -111,6 +112,7 @@
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KTEXTEDITOR_LIBS}
- )
-+add_dependencies(cppassistantstest kdevcpplanguagesupport)
-
- add_definitions(-DTEST_COMPLETION)
-
-@@ -147,6 +149,7 @@
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KTEXTEDITOR_LIBS}
- )
-+add_dependencies(cppcodecompletiontest kdevcpplanguagesupport)
-
- kde4_add_unit_test(cppcodegentest ${cppcodegentest_SRCS})
- target_link_libraries(cppcodegentest
-@@ -159,6 +162,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
deleted file mode 100644
index ae83830..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-parallel.diff
--
KDevelop packaging
More information about the pkg-kde-commits
mailing list