[SCM] KDE PIM Libraries module packaging branch, kde4.12, updated. debian/4.11.5-4-18-g169d2aa

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=8db731c

The following commit has been merged in the kde4.12 branch:
commit 8db731c6b6875f8fb918fea633fa36fde2497e0a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Feb 8 11:48:09 2014 +0100

    New patch: ship_knut
---
 debian/changelog                |  1 +
 debian/patches/series           |  1 +
 debian/patches/ship_akonaditest |  7 +++---
 debian/patches/ship_knut        | 49 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5960ad9..103313e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ kdepimlibs (4:4.12.2-1~2) UNRELEASED; urgency=medium
   * Update install files.
   * New patch: ship_akonaditest
   * Add shlibs to kdelibs5-dev.
+  * New patch: ship_knut
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 30 Jan 2014 11:21:56 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 9408a50..5f48100 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ship_akonaditest
+ship_knut
diff --git a/debian/patches/ship_akonaditest b/debian/patches/ship_akonaditest
index 063bcf5..7e799c0 100644
--- a/debian/patches/ship_akonaditest
+++ b/debian/patches/ship_akonaditest
@@ -1,14 +1,13 @@
 Index: kdepimlibs/akonadi/CMakeLists.txt
 ===================================================================
---- kdepimlibs.orig/akonadi/CMakeLists.txt	2014-02-07 21:21:21.886884572 +0100
-+++ kdepimlibs/akonadi/CMakeLists.txt	2014-02-07 21:21:49.395523086 +0100
-@@ -9,6 +9,9 @@
+--- kdepimlibs.orig/akonadi/CMakeLists.txt	2014-02-08 11:42:05.905985618 +0100
++++ kdepimlibs/akonadi/CMakeLists.txt	2014-02-08 11:47:12.469247368 +0100
+@@ -9,6 +9,8 @@
  
  if (KDE4_BUILD_TESTS)
  add_subdirectory( tests )
 +else()
 +add_subdirectory( tests/testrunner )
-+add_subdirectory( tests/testresource )
  endif()
  
  add_definitions( ${AKONADI_DEFINITIONS} )
diff --git a/debian/patches/ship_knut b/debian/patches/ship_knut
new file mode 100644
index 0000000..e54b273
--- /dev/null
+++ b/debian/patches/ship_knut
@@ -0,0 +1,49 @@
+Index: kdepimlibs/akonadi/tests/testresource/CMakeLists.txt
+===================================================================
+--- kdepimlibs.orig/akonadi/tests/testresource/CMakeLists.txt	2014-02-08 13:21:33.582859153 +0100
++++ kdepimlibs/akonadi/tests/testresource/CMakeLists.txt	2014-02-08 13:21:33.582859153 +0100
+@@ -1,5 +1,32 @@
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${AKONADI_INCLUDE_DIR}
++  ${AKONADI_INCLUDE_DIR}/akonadi/private
++  ${Boost_INCLUDE_DIR}
++  ${CMAKE_SOURCE_DIR}/akonadi
++  ${CMAKE_BINARY_DIR}/akonadi
++  ${CMAKE_BINARY_DIR}/akonadi/kmime
++  ${CMAKE_BINARY_DIR}/kmime
++)
++
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
++find_package(LibXslt)
++set_package_properties(LibXslt PROPERTIES DESCRIPTION "xsltproc" URL "http://xmlsoft.org/XSLT/" TYPE REQUIRED PURPOSE "Needed to generate D-Bus interface specifications")
++
++# generates a D-Bus interface description from a KConfigXT file
++macro(kcfg_generate_dbus_interface _kcfg _name)
++  add_custom_command(
++    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
++    COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name}
++    ${CMAKE_SOURCE_DIR}/akonadi/kcfg2dbus.xsl
++    ${_kcfg}
++    > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
++    DEPENDS ${CMAKE_SOURCE_DIR}/akonadi/kcfg2dbus.xsl
++    ${_kcfg}
++    )
++endmacro()
++
+ # Disabled for now, resourcetester remained in kdepim-runtime
+ #add_subdirectory( tests )
+ 
+Index: kdepimlibs/akonadi/CMakeLists.txt
+===================================================================
+--- kdepimlibs.orig/akonadi/CMakeLists.txt	2014-02-08 13:21:30.530787958 +0100
++++ kdepimlibs/akonadi/CMakeLists.txt	2014-02-08 13:22:29.376160574 +0100
+@@ -11,6 +11,7 @@
+ add_subdirectory( tests )
+ else()
+ add_subdirectory( tests/testrunner )
++add_subdirectory( tests/testresource )
+ endif()
+ 
+ add_definitions( ${AKONADI_DEFINITIONS} )

-- 
KDE PIM Libraries module packaging