[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.13.1-1-17-gdb74b58

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 37929b9212420b29d9a589f523c80d61fba31f5a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Aug 20 21:29:37 2014 +0200

    Remove upstream applied patches: ship_akonaditest and ship_knut
---
 debian/changelog                |  1 +
 debian/patches/series           |  2 --
 debian/patches/ship_akonaditest | 13 -----------
 debian/patches/ship_knut        | 49 -----------------------------------------
 4 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03208d4..3cc596e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepimlibs (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove upstream applied patches: ship_akonaditest and ship_knut
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:31:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index e53b441..340c9a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-ship_akonaditest
-ship_knut
 add_soname_to_xsd_file
 sslv2_disabled.patch
diff --git a/debian/patches/ship_akonaditest b/debian/patches/ship_akonaditest
deleted file mode 100644
index 7e799c0..0000000
--- a/debian/patches/ship_akonaditest
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdepimlibs/akonadi/CMakeLists.txt
-===================================================================
---- 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 )
- endif()
- 
- add_definitions( ${AKONADI_DEFINITIONS} )
diff --git a/debian/patches/ship_knut b/debian/patches/ship_knut
deleted file mode 100644
index e54b273..0000000
--- a/debian/patches/ship_knut
+++ /dev/null
@@ -1,49 +0,0 @@
-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