[SCM] kdepim-addons packaging branch, master, updated. 7dd45435941818bc00c1e1569196d6f7e97f3d9a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdepim-addons.git;a=commitdiff;h=7dd4543

The following commit has been merged in the master branch:
commit 7dd45435941818bc00c1e1569196d6f7e97f3d9a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 12:02:48 2016 +0200

    Rename the files in the binary dir, install them from there
---
 debian/patches/remove_sh_extensions | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/patches/remove_sh_extensions b/debian/patches/remove_sh_extensions
index e22cd0e..39c2979 100644
--- a/debian/patches/remove_sh_extensions
+++ b/debian/patches/remove_sh_extensions
@@ -1,12 +1,17 @@
 --- a/kmail/plugins/common/avscripts/CMakeLists.txt
 +++ b/kmail/plugins/common/avscripts/CMakeLists.txt
-@@ -1,3 +1,6 @@
+@@ -1,3 +1,11 @@
  if(UNIX)
 -  install( PROGRAMS kmail_clamav.sh kmail_sav.sh kmail_fprot.sh kmail_antivir.sh  DESTINATION ${KDE_INSTALL_BINDIR} )
-+  configure_file(kmail_clamav.sh ${KDE_INSTALL_BINDIR}/kmail_clamav COPYONLY)
-+  configure_file(kmail_sav.sh ${KDE_INSTALL_BINDIR}/kmail_sav COPYONLY)
-+  configure_file(kmail_fprot.sh ${KDE_INSTALL_BINDIR}/kmail_fprot COPYONLY)
-+  configure_file(kmail_antivir.sh ${KDE_INSTALL_BINDIR}/kmail_antivir COPYONLY)
++  configure_file(kmail_clamav.sh  ${CMAKE_CURRENT_BINARY_DIR}/kmail_clamav  COPYONLY)
++  configure_file(kmail_sav.sh     ${CMAKE_CURRENT_BINARY_DIR}/kmail_sav     COPYONLY)
++  configure_file(kmail_fprot.sh   ${CMAKE_CURRENT_BINARY_DIR}/kmail_fprot   COPYONLY)
++  configure_file(kmail_antivir.sh ${CMAKE_CURRENT_BINARY_DIR}/kmail_antivir COPYONLY)
++  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kmail_clamav
++                   ${CMAKE_CURRENT_BINARY_DIR}/kmail_sav
++                   ${CMAKE_CURRENT_BINARY_DIR}/kmail_fprot
++                   ${CMAKE_CURRENT_BINARY_DIR}/kmail_antivir
++          DESTINATION ${KDE_INSTALL_BINDIR})
  endif()
 --- a/kmail/plugins/common/kmail.antivirusrc
 +++ b/kmail/plugins/common/kmail.antivirusrc

-- 
kdepim-addons packaging