2005-11-07 [paul] 1.9.99cvs14

	* doc/man/Makefile.am
	* doc/man/sylpheed-claws.1	** ADDED **
	* doc/man/sylpheed.1		** DELETED **
		rename and update the man file

diff --git a/ChangeLog b/ChangeLog
index 07e3b01022312b78c23a8330207d48a46d5d84b2..8e4967ba983d3f46c5df80f477af1c22a3501fa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-07 [paul]      1.9.99cvs14
+
+       * doc/man/Makefile.am
+       * doc/man/sylpheed-claws.1      ** ADDED **
+       * doc/man/sylpheed.1            ** DELETED **
+               rename and update the man file
+
 2005-11-06 [colin]     1.9.99cvs13
 
        * src/ldif.c

diff --git a/PATCHSETS b/PATCHSETS
index 6614c21a4047f6add81ba4582a319750240ca1b4..418d1a4c2a603922ba2959e46b5df92570bb6ef6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -980,3 +980,4 @@
 ( cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/gtk/about.c;  ) > 1.9.99cvs11.patchset
 ( cvs diff -u -r 1.96.2.82 -r 1.96.2.83 src/textview.c;  cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/gtk/about.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/gtk/gtkutils.h;  ) > 1.9.99cvs12.patchset
 ( cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/ldif.c;  ) > 1.9.99cvs13.patchset
+( cvs diff -u -r 1.2 -r 1.3 doc/man/Makefile.am;  diff -u /dev/null doc/man/sylpheed-claws.1;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/man/sylpheed.1;  ) > 1.9.99cvs14.patchset

diff --git a/configure.ac b/configure.ac
index 0e60ae04a5d3053d4e26051e22f90c69d0d59ffb..48a3b162a173d5b97e2e10759d2de7dce72a38a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 3a2e5cd140f45c1aff58dbd871bd5bad10e80d71..e2db9717e6aad3e1e84173c895f53cea9f9d1c73 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,4 @@
 man_MANS = \
-     sylpheed.1
+     sylpheed-claws.1
 
 EXTRA_DIST = $(man_MANS)

diff --git a/doc/man/sylpheed.1 b/doc/man/sylpheed-claws.1
similarity index 76%
rename from doc/man/sylpheed.1
rename to doc/man/sylpheed-claws.1
index 16a229d0b235285ec5fe8106959134016b0036d6..a41f46826284cd80a80f31c22e7007e5ca389e58 100644 (file)
--- a/doc/man/sylpheed.1
+++ b/doc/man/sylpheed-claws.1
@@ -137,40 +137,40 @@ Directory for plugins
 $PREFIX/include/sylpheed\-claws
 Directory for header files
 .TP 
-$HOME/.sylpheed\-gtk2
+$HOME/.sylpheed\-claws
 Default directory for user's configuration files directory
 .TP 
-$HOME/.sylpheed\-gtk2/themes
+$HOME/.sylpheed\-claws/themes
 User's themes directory
 .TP 
-$HOME/.sylpheed\-gtk2/accountrc
+$HOME/.sylpheed\-claws/accountrc
 Configuration for account(s)
 .TP 
-$HOME/.sylpheed\-gtk2/addrbook*
+$HOME/.sylpheed\-claws/addrbook*
 Addressbook files
 .TP 
-$HOME/.sylpheed\-gtk2/command_history
+$HOME/.sylpheed\-claws/command_history
 User\-specified commands
 .TP 
-$HOME/.sylpheed\-gtk2/customheaderrc
+$HOME/.sylpheed\-claws/customheaderrc
 Configuration for custom headers for sending mail
 .TP 
-$HOME/.sylpheed\-gtk2/dispheaderrc
+$HOME/.sylpheed\-claws/dispheaderrc
 Configuration for custom display of headers in message view
 .TP 
-$HOME/.sylpheed\-gtk2/matcherrc
+$HOME/.sylpheed\-claws/matcherrc
 Filtering and Processing function configuration
 .TP 
-$HOME/.sylpheed\-gtk2/folderlist.xml
+$HOME/.sylpheed\-claws/folderlist.xml
 Folder hierarchy listing
 .TP 
-$HOME/.sylpheed\-gtk2/menurc
+$HOME/.sylpheed\-claws/menurc
 Menu shortcut\-key configuration
 .TP 
-$HOME/.sylpheed\-gtk2/sylpheed.log
+$HOME/.sylpheed\-claws/sylpheed\-claws.log
 Sylpheed logfile
 .TP 
-$HOME/.sylpheed\-gtk2/sylpheedrc
+$HOME/.sylpheed\-claws/sylpheedrc
 Main configuration file
 
 
@@ -178,7 +178,7 @@ Main configuration file
 .LP 
 To run this program the standard way type:
 .LP 
-sylpheed
+sylpheed\-claws
 .LP 
 Alternatively you can run it with the following options:
 .TP 
@@ -235,7 +235,7 @@ display version number and exit
 display the CONFIG\-DIR and exit
 .SH "INSTALLATION"
 .LP 
-This program requires GTK+ 1.2.6 or higher to be compiled.
+This program requires GTK+ 2.4.x or higher to be compiled.
 .LP 
 Please make sure that gtk\-devel and glib\-devel (or similar) packages are
 installed before the compilation (you may also require flex (lex) and bison
@@ -257,51 +257,54 @@ Refer to ./configure \-\-help for further information.
 .SH "AUTHORS"
 .LP 
 .TP 
-main\-branch (http://sylpheed.good\-day.net)
-Hiroyuki Yamamoto   <hiro\-y@kcn.ne.jp>
-                    <yamamoto@good\-day.co.jp>
-.TP 
-claws\-branch (http://sylpheed\-claws.sourceforge.net)
-Hoa viet Dinh       <dinh.viet.hoa@free.fr>
-.br 
-Match Grun             <match@dimensional.com>
-.br 
-Melvin Hadasht         <melvin.hadasht@free.fr>
-.br 
-Christoph Hohmann      <reboot@gmx.ch>
-.br 
-Alfons Hoogervorst     <alfons@proteus.demon.nl>
-.br 
-Darko Koruga           <darko.koruga@hermes.si>
-.br 
-Colin Leroy            <colin@colino.net>
-.br 
-Thorsten Maerz         <torte@netztorte.de>
-.br 
-Paul Mangan            <claws@thewildbeast.co.uk>
-.br 
-Luke Plant             <L.Plant.98@cantab.net>
-.br 
-Martin Schaaf          <mascha@ma\-scha.de>
-.br 
-Carsten Schurig     <Carsten.Schurig@web.de>
-.br 
-Sergey Vlasov          <vsu@users.sourceforge.net>
-.br 
-Hiroyuki Yamamoto      <hiro\-y@kcn.ne.jp>
-.TP 
-sylpheed\-claws\-w32
-Thorsten Maerz         <torte@netztorte.de>\fR
+The Sylpheed-Claws Team
+Holger Berndt                  <berndth@users.sf.net>
+.br
+Hoà Viêt Dinh                  <hoa@users.sf.net>
+.br
+Darko Koruga                   <darko@users.sf.net>
+.br
+Ricardo Mones Lastra   <mones@users.sf.net>
+.br
+Colin Leroy                    <colinleroy@users.sf.net>
+.br
+Thorsten Maerz                 <netztorte@users.sf.net>
+.br
+Paul Mangan                    <twb@users.sf.net>
+.br
+Martin Schaaf                  <mascha1@users.sf.net>
+.br
+wwp                                    <wwp@users.sf.net>
+
+.TP
+Previous team members
+Keith Edmunds
+.br
+Match Grun
+.br
+Melvin Hadasht
+.br
+Oliver Haertel
+.br
+Christoph Hohmann
+.br
+Alfons Hoogervorst
+.br
+Leandro A. F. Pereira
+.br
+Luke Plant
+.br
+Martin Schaaf
+.br
+Carsten Schurig
+.br
+Sergey Vlasov
+.br
+Hiroyuki Yamamoto
 
 
 .SH "SEE ALSO"
 .LP 
 .TP 
-Sylpheed Homepage
-<http://sylpheed.good\-day.net>
-.TP 
 Sylpheed\-Claws Homepage
-<http://sylpheed\-claws.sf.net>
-.TP 
-Sylpheed\-Claws Win32 Homepage
-<http://sylpheed\-claws.sf.net/win32>
+<http://claws.sylpheed.org>