diff options
| author |   Tom Knight <tomk@gentoo.org> | 2007-03-13 11:20:44 +0000 |
|---|---|---|
| committer | Tom Knight <tomk@gentoo.org> | 2007-03-13 11:20:44 +0000 |
| commit | 983b4ce1a9d168dc613267b47d2e0b7558f82077 (patch) | |
| tree | 3773b69820ba6731117fadf7cad1f5171e978f68 /mail-filter/spamassassin-fuzzyocr | |
| parent | revision bump to kill automagic dependency on flim; plus some quotes (diff) | |
| download | gentoo-2-983b4ce1a9d168dc613267b47d2e0b7558f82077.tar.gz gentoo-2-983b4ce1a9d168dc613267b47d2e0b7558f82077.tar.bz2 gentoo-2-983b4ce1a9d168dc613267b47d2e0b7558f82077.zip | |
Fixed conflicting patches
(Portage version: 2.1.1-r1)
Diffstat (limited to 'mail-filter/spamassassin-fuzzyocr')
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch | 7 | ||||
| -rw-r--r-- | mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch | 7 |
3 files changed, 5 insertions, 15 deletions
diff --git a/mail-filter/spamassassin-fuzzyocr/ChangeLog b/mail-filter/spamassassin-fuzzyocr/ChangeLog index ed215bd2eae2..1e70394ca2ed 100644 --- a/mail-filter/spamassassin-fuzzyocr/ChangeLog +++ b/mail-filter/spamassassin-fuzzyocr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-filter/spamassassin-fuzzyocr # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.5 2007/03/12 19:01:12 tomk Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.6 2007/03/13 11:20:44 tomk Exp $ + + 13 Mar 2007; Tom Knight <tomk@gentoo.org> files/disableocrad.patch, + files/enabletesseract.patch: + Fixed conflicting patches *spamassassin-fuzzyocr-3.5.1 (11 Mar 2007) diff --git a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch b/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch index bd78cb64acad..cda344a6513e 100644 --- a/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch +++ b/mail-filter/spamassassin-fuzzyocr/files/disableocrad.patch @@ -49,10 +49,3 @@ # Standard Gocr Scanset scanset gocr { -@@ -59,4 +59,4 @@ - # preprocessors = normalize, invert, normalize - # command = $gocr - # args = -i $input --#} -\ No newline at end of file -+#} diff --git a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch b/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch index bf2aa15453da..b95d0e7113d9 100644 --- a/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch +++ b/mail-filter/spamassassin-fuzzyocr/files/enabletesseract.patch @@ -19,10 +19,3 @@ # Another example, this basically does the same as the inverted Ocrad Scanset # Only listed here to serve as example, ocrad-invert does this already -@@ -59,4 +59,4 @@ - # preprocessors = normalize, invert, normalize - # command = $gocr - # args = -i $input --#} -\ No newline at end of file -+#} |