2006-10-31 [colin] 2.5.6cvs14

	* COPYING
		Allow linking with the Apache licensed files in
		src/plugins/spamassassin. Hopefully fixes
		bug 1048, 'Spamassassin plugin license problem'

diff --git a/COPYING b/COPYING
index 36af8274ca1d2f6f024b4745f02239ca81e5725b..19e360479d839b2dc07ded7c1431a769daaa9697 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-The code in this distribution is Copyright 1999-2005 by Hiroyuki Yamamoto
+The code in this distribution is Copyright 1999-2006 by Hiroyuki Yamamoto
 and the Sylpheed-Claws team.
 
 As a special exception, the Sylpheed-Claws team gives permission to link 
@@ -10,6 +10,13 @@ code used other than "OpenSSL". If you modify this file, you may extend this
 exception to your version of the file, but you are not obliged to do so. If 
 you do not wish to do so, delete this exception statement from your version. 
 
+As a special exception, the Sylpheed-Claws team gives permission to link 
+the code of its release of Sylpheed-Claws with the two Spamassassin files 
+src/plugins/spamassassin/libspamc.c and src/plugins/spamassassin/libspamc.h
+included in the releases, which are licenced under the Apache License version
+2.0. The Sylpheed-Claws team allow the compilation and distribution of 
+Sylpheed-Claws with these files without invoking GPL clause 2(b). 
+
 -------------------------------------------------------------------------------
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991

diff --git a/ChangeLog b/ChangeLog
index 88464ed980a90cbd0d2fbf163e7890c01d420c83..173dc8df230d8bd766faaccc8aee32f93ecc6d73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-31 [colin]     2.5.6cvs14
+
+       * COPYING
+               Allow linking with the Apache licensed files in
+               src/plugins/spamassassin. Hopefully fixes 
+               bug 1048, 'Spamassassin plugin license problem'
+
 2006-10-31 [wwp]       2.5.6cvs13
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 8c7da4d4bf02524a308b1adba9455c34c4779920..e1e96dd8d6eec0e2175dbc3eb2d1dbb4cddbdb49 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2016,3 +2016,4 @@
 ( cvs diff -u -r 1.204.2.106 -r 1.204.2.107 src/prefs_common.c;  cvs diff -u -r 1.103.2.64 -r 1.103.2.65 src/prefs_common.h;  cvs diff -u -r 1.382.2.319 -r 1.382.2.320 src/compose.c;  ) > 2.5.6cvs11.patchset
 ( cvs diff -u -r 1.1.4.53 -r 1.1.4.54 src/etpan/imap-thread.c;  cvs diff -u -r 1.179.2.135 -r 1.179.2.136 src/imap.c;  ) > 2.5.6cvs12.patchset
 ( cvs diff -u -r 1.382.2.320 -r 1.382.2.321 src/compose.c;  ) > 2.5.6cvs13.patchset
+( cvs diff -u -r 1.5.10.2 -r 1.5.10.3 COPYING;  ) > 2.5.6cvs14.patchset

diff --git a/configure.ac b/configure.ac
index 319b55365b998a98f1edabe59b65671bb731afe2..7558b9bef4bddce0feb089c697a6f0fd521e868e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=