[SCM] kdepim-addons packaging branch, master, updated. 4d5abf40dde1547cac2ee40c7ed1b51a3181a1cb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit baed2199f8ee67e36effbb0c77aadcd23f83c126
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Tue May 10 22:16:16 2016 +0200

    Refresh patches
---
 debian/patches/remove_sh_extensions | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/patches/remove_sh_extensions b/debian/patches/remove_sh_extensions
index 39c2979..823da1d 100644
--- a/debian/patches/remove_sh_extensions
+++ b/debian/patches/remove_sh_extensions
@@ -1,3 +1,14 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Tue, 10 May 2016 22:16:14 +0200
+Subject: remove_sh_extensions
+
+---
+ kmail/plugins/common/avscripts/CMakeLists.txt | 10 +++++++++-
+ kmail/plugins/common/kmail.antivirusrc        |  8 ++++----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/kmail/plugins/common/avscripts/CMakeLists.txt b/kmail/plugins/common/avscripts/CMakeLists.txt
+index 304cc90..b2a529e 100644
 --- a/kmail/plugins/common/avscripts/CMakeLists.txt
 +++ b/kmail/plugins/common/avscripts/CMakeLists.txt
 @@ -1,3 +1,11 @@
@@ -13,9 +24,11 @@
 +                   ${CMAKE_CURRENT_BINARY_DIR}/kmail_antivir
 +          DESTINATION ${KDE_INSTALL_BINDIR})
  endif()
+diff --git a/kmail/plugins/common/kmail.antivirusrc b/kmail/plugins/common/kmail.antivirusrc
+index 55da39f..22dab71 100644
 --- a/kmail/plugins/common/kmail.antivirusrc
 +++ b/kmail/plugins/common/kmail.antivirusrc
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ VisibleName=Clam Anti-Virus
  Executable=clamscan -V
  URL=http://clamav.sf.net
  PipeFilterName=Clam Anti-Virus Check
@@ -24,7 +37,7 @@
  DetectionHeader=X-Virus-Flag
  DetectionPattern=yes
  UseRegExp=0
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ VisibleName=Sophos AntiVirus
  Executable=sweep -v
  URL=http://www.sophos.com
  PipeFilterName=Sophos Anti-Virus Check
@@ -33,7 +46,7 @@
  DetectionHeader=X-Virus-Flag
  DetectionPattern=yes
  UseRegExp=0
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ VisibleName=F-Prot AntiVirus
  Executable=f-prot -verno
  URL=http://www.f-prot.com
  PipeFilterName=F-Prot Anti-Virus Check
@@ -42,7 +55,7 @@
  DetectionHeader=X-Virus-Flag
  DetectionPattern=yes
  UseRegExp=0
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ VisibleName=H+BEDV AntiVir
  Executable=antivir --version
  URL=http://www.antivir.de
  PipeFilterName=AntiVir Anti-Virus Check

-- 
kdepim-addons packaging