2005-07-24 [paul] 1.9.13cvs1

	* doc/man/sylpheed.1
		update man page, incorporating fix of
		bug 769 'Typo in manpage'
	* src/etpan/imap-thread.c
		fix NetBSD openssl dependencies. patch by
		George Michaelson <ggm@apnic.net>

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b254baf3a4257a5ace71eb9edf98ac93d578952d..ce136e1544876107b167b7009bccbe45c969f9e3 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-07-24 [paul]      1.9.13cvs1
+
+       * doc/man/sylpheed.1
+               update man page, incorporating fix of
+               bug 769 'Typo in manpage'
+       * src/etpan/imap-thread.c
+               fix NetBSD openssl dependencies. patch by
+               George Michaelson <ggm@apnic.net>
+
 2005-07-22 [paul]      1.9.13
 
        1.9.13 release

diff --git a/PATCHSETS b/PATCHSETS
index 152941cf0f60bea6fd2d4b477b7a845c4318945a..1e9099920dd015f8e6cfe4b16198b685a4d9b3ac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -686,3 +686,4 @@
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 commitHelper;  cvs diff -u -r 1.654.2.723 -r 1.654.2.724 configure.ac;  cvs diff -u -r 1.16.2.22 -r 1.16.2.23 src/msgcache.c;  ) > 1.9.12cvs89.patchset
 ( cvs diff -u -r 1.213.2.42 -r 1.213.2.43 src/folder.c;  ) > 1.9.12cvs90.patchset
 ( cvs diff -u -r 1.100.2.22 -r 1.100.2.23 AUTHORS;  cvs diff -u -r 1.29.2.6 -r 1.29.2.7 INSTALL;  cvs diff -u -r 1.37.2.3 -r 1.37.2.4 README.claws;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 RELEASE_NOTES.claws;  cvs diff -u -r 1.654.2.725 -r 1.654.2.726 configure.ac;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/ca.po;  cvs diff -u -r 1.58.2.10 -r 1.58.2.11 po/de.po;  cvs diff -u -r 1.60.2.11 -r 1.60.2.12 po/es.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/fi.po;  cvs diff -u -r 1.42.2.11 -r 1.42.2.12 po/fr.po;  cvs diff -u -r 1.34.2.10 -r 1.34.2.11 po/it.po;  diff -u /dev/null po/nb.po;  cvs diff -u -r 1.2.2.12 -r 1.2.2.13 po/sk.po;  cvs diff -u -r 1.17.2.11 -r 1.17.2.12 po/sr.po;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 po/zh_CN.po;  cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.23.2.10 -r 1.23.2.11 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/claws.i18n.status.pl;  ) > 1.9.12cvs91.patchset
+( cvs diff -u -r 1.5.2.1 -r 1.5.2.2 doc/man/sylpheed.1;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/etpan/imap-thread.c;  ) > 1.9.13cvs1.patchset

diff --git a/configure.ac b/configure.ac
index 7609abb58651e52d673aa40a127fbc24912dedc4..9ac9f04410e8ac24231f1f40e11a4a8e723cf6ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/doc/man/sylpheed.1 b/doc/man/sylpheed.1
index 157e1de403542e3feb733c94d75ad02ee07f7a9a..16a229d0b235285ec5fe8106959134016b0036d6 100644 (file)
--- a/doc/man/sylpheed.1
+++ b/doc/man/sylpheed.1
@@ -119,58 +119,58 @@ This list is not complete.
 $HOME/Mail
 Default directory for mail storage
 .TP 
-$PREFIX/share/sylpheed
+$PREFIX/share/sylpheed\-claws
 Global program directory
 .TP 
-$PREFIX/share/sylpheed/manual
+$PREFIX/share/sylpheed\-claws/manual
 Manual files in HTML format
 .TP 
-$PREFIX/share/sylpheed/faq
+$PREFIX/share/sylpheed\-claws/faq
 FAQ files in HTML format
 .TP 
-$PREFIX/share/sylpheed/themes
+$PREFIX/share/sylpheed\-claws/themes
 Global themes directory
 .TP 
-$PREFIX/lib/sylpheed/plugins
+$PREFIX/lib/sylpheed\-claws/plugins
 Directory for plugins
 .TP 
-$PREFIX/include/sylpheed
+$PREFIX/include/sylpheed\-claws
 Directory for header files
 .TP 
-$HOME/.sylpheed 
+$HOME/.sylpheed\-gtk2
 Default directory for user's configuration files directory
 .TP 
-$HOME/.sylpheed/themes
+$HOME/.sylpheed\-gtk2/themes
 User's themes directory
 .TP 
-$HOME/.sylpheed/accountrc
+$HOME/.sylpheed\-gtk2/accountrc
 Configuration for account(s)
 .TP 
-$HOME/.sylpheed/addrbook*
+$HOME/.sylpheed\-gtk2/addrbook*
 Addressbook files
 .TP 
-$HOME/.sylpheed/command_history
+$HOME/.sylpheed\-gtk2/command_history
 User\-specified commands
 .TP 
-$HOME/.sylpheed/customheaderrc
+$HOME/.sylpheed\-gtk2/customheaderrc
 Configuration for custom headers for sending mail
 .TP 
-$HOME/.sylpheed/dispheaderrc
+$HOME/.sylpheed\-gtk2/dispheaderrc
 Configuration for custom display of headers in message view
 .TP 
-$HOME/.sylpheed/matcherrc
+$HOME/.sylpheed\-gtk2/matcherrc
 Filtering and Processing function configuration
 .TP 
-$HOME/.sylpheed/folderlist.xml
-Folder hierachy listing
+$HOME/.sylpheed\-gtk2/folderlist.xml
+Folder hierarchy listing
 .TP 
-$HOME/.sylpheed/menurc
+$HOME/.sylpheed\-gtk2/menurc
 Menu shortcut\-key configuration
 .TP 
-$HOME/.sylpheed/sylpheed.log
+$HOME/.sylpheed\-gtk2/sylpheed.log
 Sylpheed logfile
 .TP 
-$HOME/.sylpheed/sylpheedrc
+$HOME/.sylpheed\-gtk2/sylpheedrc
 Main configuration file
 
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 933c1445a2ab821179e0ae882cd06e6b68b2a790..e801dcb7851d07b938e1ffab06617e522838f2ae 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -8,6 +8,9 @@
 #include <imap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#if defined (__NetBSD__)
+#include <sys/socket.h>
+#endif
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/wait.h>