[Amavisd-new-commits] [pkg-amavisd-new] 03/05: Remove incorrect patch to file under debian

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository pkg-amavisd-new.

commit 3a4e1cbf37eb56344984b3647cf65cb907328b07
Author: Brian May <brian at linuxpenguins.xyz>
Date:   Fri Jul 14 10:31:01 2017 +1000

    Remove incorrect patch to file under debian
---
 debian/patches/10_disable_nvcc | 21 ---------------------
 debian/patches/series          |  1 -
 2 files changed, 22 deletions(-)

diff --git a/debian/patches/10_disable_nvcc b/debian/patches/10_disable_nvcc
deleted file mode 100644
index db43f52..0000000
--- a/debian/patches/10_disable_nvcc
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/debian/etc/conf.d/15-av_scanners b/debian/etc/conf.d/15-av_scanners
-index 59ac2f3..1e0b527 100644
---- a/debian/etc/conf.d/15-av_scanners
-+++ b/debian/etc/conf.d/15-av_scanners
-@@ -247,10 +247,12 @@ use strict;
- #   ["SCAN {}/*\r\n", '127.0.0.1:8448' ],
- #   qr/^200 File OK/m, qr/^201 /m, qr/^201 (.+)/m ],
- 
--  ### http://www.norman.com/products_nvc.shtml
--  ['Norman Virus Control v5 / Linux', 'nvcc',
--    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
--    qr/(?i).* virus in .* -> \'(.+)\'/m ],
-+# Disabled as it conflicts with packaged /usr/bin/nvcc of "nvidia-cuda-toolkit"
-+# (LP: 1582318)
-+#  ### http://www.norman.com/products_nvc.shtml
-+#  ['Norman Virus Control v5 / Linux', 'nvcc',
-+#    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
-+#    qr/(?i).* virus in .* -> \'(.+)\'/m ],
- 
-   ### http://www.pandasoftware.com/
-   ['Panda CommandLineSecure 9 for Linux',
diff --git a/debian/patches/series b/debian/patches/series
index 80d7eee..141aac4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-10_disable_nvcc
 20_safe_path_at_init.patch
 30_conf.d_support_builtin.patch
 40_fix_paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git