[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=034d5cb

The following commit has been merged in the master branch:
commit 034d5cbd496b2264e92de400003bda34db477541
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Apr 1 18:44:31 2015 +0200

    Use KAccounts macro for generating provider and serive files
---
 data/kaccounts/CMakeLists.txt | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/data/kaccounts/CMakeLists.txt b/data/kaccounts/CMakeLists.txt
index f5178c8..75f1b3b 100644
--- a/data/kaccounts/CMakeLists.txt
+++ b/data/kaccounts/CMakeLists.txt
@@ -1,15 +1,9 @@
 file(GLOB service_files_in *.service.in)
 foreach(service_file_in ${service_files_in})
-    get_filename_component(service_filename ${service_file_in} NAME_WE)
-    set(service_file ${CMAKE_CURRENT_BINARY_DIR}/${service_filename}.service)
-    execute_process(COMMAND intltool-merge -x -u --no-translations ${service_file_in} ${service_file})
-    install(FILES ${service_file} DESTINATION ${ACCOUNTS_SERVICES_DIR})
+    kaccounts_add_service(${service_file_in})
 endforeach()
 
 file(GLOB provider_in_files *.provider.in)
 foreach(provider_in_file ${provider_in_files})
-    get_filename_component(provider_filename ${provider_in_file} NAME_WE)
-    set(provider_file ${CMAKE_CURRENT_BINARY_DIR}/${provider_filename}.provider)
-    execute_process(COMMAND intltool-merge -x -u --no-translations ${provider_in_file} ${provider_file})
-    install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
-endforeach()
\ No newline at end of file
+    kaccounts_add_provider(${provider_in_file})
+endforeach()

-- 
ktp-accounts-kcm packaging