2006-11-01 [colin] 2.5.6cvs16

	* COPYING
		Add missed files to the Apache exception

diff --git a/COPYING b/COPYING
index 19e360479d839b2dc07ded7c1431a769daaa9697..d53627047cf7d67076679346aa47a063ebb9140b 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -11,8 +11,9 @@ 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
+the code of its release of Sylpheed-Claws with the four Spamassassin files 
+src/plugins/spamassassin/libspamc.c, src/plugins/spamassassin/libspamc.h,
+src/plugins/spamassassin/utils.c and src/plugins/spamassassin/utils.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). 

diff --git a/ChangeLog b/ChangeLog
index 5d7642ee1ceb6c2a5f1035bf26b35ebb36e0fe29..e8833941ef133a24dfbee8f728c4891c391c3d0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-01 [colin]     2.5.6cvs16
+
+       * COPYING
+               Add missed files to the Apache exception
+
 2006-10-31 [colin]     2.5.6cvs15
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index e147d56987844f53e990c1af25ff5b2810eee1dd..2dfe61ede45905ce3efc413f47910c3be46fe9e0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2018,3 +2018,4 @@
 ( 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
 ( cvs diff -u -r 1.213.2.123 -r 1.213.2.124 src/folder.c;  cvs diff -u -r 1.87.2.31 -r 1.87.2.32 src/folder.h;  ) > 2.5.6cvs15.patchset
+( cvs diff -u -r 1.5.10.3 -r 1.5.10.4 COPYING;  ) > 2.5.6cvs16.patchset

diff --git a/configure.ac b/configure.ac
index 7cd960d43cd804a42014ae2d4a1080cefb5248e9..cd168eaac6dbd91fbe770735c540f8387375e031 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=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=