sync with sylpheed 0.6.5 release

diff --git a/AUTHORS b/AUTHORS
index 4eb670861a952e5bfc265dbcc28afdf430758559..1be63d88757847e9dfd4659583367df40582d122 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -88,3 +88,7 @@ contributors (beside the above; based on Changelog)
        Thierry Godefroy
        Matthieu Dazy
        Jonathan Ware
+       Yasumatsu
+       Stefaan A Eeckels
+       OSHIRO Naoki
+       KAJIWARA

diff --git a/ChangeLog b/ChangeLog
index e4d040a1927bec8815cec32b21f15c0e0665e0a2..7aed257859ff8313b37bd452fccec68e86abe240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-07
+
+       * version 0.6.5
+
+2001-11-07
+
+       * src/socket.c: ssl_gets(): use SSL_peek.
+       * updated NEWS and AUTHORS.
+       * Makefile.am: fixed release target.
+
 2001-11-06
 
        * src/template.c: changed the format of template file to

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e3680e8935fab9aadb7f7fa04bf236759c1c3796..1cdfbe39e903fcb023209e30dcf23d0a151c1474 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-11-07 [paul]      0.6.5claws1
+
+       * sync with sylpheed 0.6.5. release
+               see ChangeLog entry 2001-11-07
+
 2001-11-07 [paul]      0.6.4claws31
 
        * sync with sylpheed 0.6.4cvs18

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 481813036cc9914c1589796dc079e88ce61a225e..62080007649eff2296123cb0098e5e5075371838 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,13 @@
+2001-11-07
+
+       * version 0.6.5
+
+2001-11-07
+
+       * src/socket.c: ssl_gets(): SSL_peek ¤ò»ÈÍÑ¡£
+       * NEWS ¤È AUTHORS ¤ò¹¹¿·¡£
+       * Makefile.am: release ¥¿¡¼¥²¥Ã¥È¤ò½¤Àµ¡£
+
 2001-11-06
 
        * src/template.c: ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤ò RFC2822

diff --git a/Makefile.am b/Makefile.am
index d78024e9867fb05f0881b9a716e3f7e69b08942a..eeaf8f394e700fa791febf1a144e6929efdd8423 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,6 @@ BZIP2_ENV =
 
 release: distdir
        -chmod -R a+r $(distdir)
-       GZIP=$(GZIP_ENV) $(AMTAR) chozf $(distdir).tar.gz $(distdir)
-       BZIP2=$(BZIP2_ENV) $(AMTAR) chojf $(distdir).tar.bz2 $(distdir)
+       GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+       BZIP2=$(BZIP2_ENV) $(TAR) chojf $(distdir).tar.bz2 $(distdir)
        -rm -rf $(distdir)

diff --git a/NEWS b/NEWS
index 25e7583192a805750ed0b226c21402bf996e937e..ed86e5890fd733c058d280dab1c26c23829bbb5d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Changes of Sylpheed
     * The password for SMTP AUTH is asked now when not specified.
     * The mime.types file is searched from several directories now.
     * The preferences dialogs have been sorted out a bit.
+    * A freeze bug on using SSL has been fixed.
     * Some bugs have been fixed.
 
 * 0.6.4

diff --git a/configure.in b/configure.in
index 03c42d406b6f338cef3eadd6a94256af1e77ea61..40e151bf353535f1163326c39b8d817912d148b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=6
-MICRO_VERSION=4
+MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws31
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl