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

Maximiliano Curia maxy at moszumanska.debian.org
Wed May 4 10:18:51 UTC 2016


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

The following commit has been merged in the master branch:
commit a60bd3a2dffb9614f83a8c0274de1bc30ed84328
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 11:24:32 2016 +0200

    Now trying to use configure_file COPYONLY
---
 debian/patches/remove_sh_extensions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/remove_sh_extensions b/debian/patches/remove_sh_extensions
index b4f7948..e22cd0e 100644
--- a/debian/patches/remove_sh_extensions
+++ b/debian/patches/remove_sh_extensions
@@ -1,12 +1,12 @@
 --- a/kmail/plugins/common/avscripts/CMakeLists.txt
 +++ b/kmail/plugins/common/avscripts/CMakeLists.txt
-@@ -1,3 +1,7 @@
+@@ -1,3 +1,6 @@
  if(UNIX)
-   install( PROGRAMS kmail_clamav.sh kmail_sav.sh kmail_fprot.sh kmail_antivir.sh  DESTINATION ${KDE_INSTALL_BINDIR} )
-+  file(RENAME ${KDE_INSTALL_BINDIR}/kmail_clamav.sh  ${KDE_INSTALL_BINDIR}/kmail_clamav)
-+  file(RENAME ${KDE_INSTALL_BINDIR}/kmail_sav.sh     ${KDE_INSTALL_BINDIR}/kmail_sav)
-+  file(RENAME ${KDE_INSTALL_BINDIR}/kmail_fprot.sh   ${KDE_INSTALL_BINDIR}/kmail_fprot)
-+  file(RENAME ${KDE_INSTALL_BINDIR}/kmail_antivir.sh ${KDE_INSTALL_BINDIR}/kmail_antivir)
+-  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)
  endif()
 --- a/kmail/plugins/common/kmail.antivirusrc
 +++ b/kmail/plugins/common/kmail.antivirusrc

-- 
kdepim-addons packaging



More information about the pkg-kde-commits mailing list