[SCM] KDE Development Platform Libraries module packaging branch, kde4.11, updated. debian/4.11.3-2

Maximiliano Curia maxy at alioth.debian.org
Fri Nov 8 11:24:46 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=40e65a8

The following commit has been merged in the kde4.11 branch:
commit 40e65a8bc906e61ebb8b78e659580cb050aad239
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Nov 8 10:40:43 2013 +0100

    New patch cmake_compatibility.diff, install kdecmake.1.
---
 debian/changelog                        |    1 +
 debian/patches/cmake_compatibility.diff |   15 +++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e0b7e0..f5e7102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde4libs (4:4.11.3-2) UNRELEASED; urgency=low
 
   * New patch kfreebsd_acl.diff, to fix build in kfreebsd-*.
   * Refresh symbols files.
+  * New patch cmake_compatibility.diff, install kdecmake.1.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 07 Nov 2013 18:27:11 +0100
 
diff --git a/debian/patches/cmake_compatibility.diff b/debian/patches/cmake_compatibility.diff
new file mode 100644
index 0000000..574e343
--- /dev/null
+++ b/debian/patches/cmake_compatibility.diff
@@ -0,0 +1,15 @@
+Index: kde4libs/cmake/modules/CMakeLists.txt
+===================================================================
+--- kde4libs.orig/cmake/modules/CMakeLists.txt	2013-11-08 10:33:38.746426398 +0100
++++ kde4libs/cmake/modules/CMakeLists.txt	2013-11-08 10:35:21.886297235 +0100
+@@ -171,8 +171,8 @@
+ #   file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${_current_FILE} OUTPUT_VARIABLE _dummy)
" )
+ #endforeach ( _current_FILE)
+ 
+-if(NOT CMAKE_VERSION VERSION_GREATER 2.8.12)
++# if(NOT CMAKE_VERSION VERSION_GREATER 2.8.12)
+   # create and install a man page for the kdelibs cmake modules
+   add_custom_target(KDECMakeModulesManPage ALL COMMAND ${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} --help-custom-modules ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1)
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1 DESTINATION "${MAN_INSTALL_DIR}/man1")
+-endif()
++# endif()
diff --git a/debian/patches/series b/debian/patches/series
index c49a0f0..8c062c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 kfreebsd_getmntent.diff
 kfreebsd_acl.diff
+cmake_compatibility.diff

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list