sync with 0.7.5

diff --git a/AUTHORS b/AUTHORS
index 9304e5eddd9d414bd0b6e6e5337b5c4991beb00f..c31516e693b69201892a60d48b45d5fa81c5fbf1 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,7 @@ claws-branch (http://sylpheed-claws.sourceforge.net)
        Christoph Hohmann       <reboot@gmx.ch>
        Alfons Hoogervorst      <alfons@proteus.demon.nl>
        Darko Koruga            <darko.koruga@hermes.si>
+       Colin Leroy             <colin@colino.net>
        Paul Mangan             <claws@thewildbeast.co.uk>
        Carsten Schurig         <Carsten.Schurig@web.de>
        Sergey Vlasov           <vsu@mivlgu.murom.ru>
@@ -38,6 +39,10 @@ user manuals
        Yoichi Imai (Japanese)  <yoichi@silver-forest.com>
        Paul Kater (English)    <paul@nlpagan.net>
 
+application icon
+
+       WAKAI Kazunao           <silver@lacmhacarh.gr.jp>
+
 contributors (beside the above; based on Changelog)
 
        Alte
@@ -84,7 +89,7 @@ contributors (beside the above; based on Changelog)
        Nishika
        shigeri
        Tajiri
-       Kazunao Wakai
+       WAKAI Kazunao
        Rodrigo Dias Arruda Senra
        Fabio Junior Beneditto
        Satoshi Nagayasu
@@ -132,7 +137,6 @@ contributors (beside the above; based on Changelog)
        Oliver Haertel
        Bob Forsman
        Ville Skyttä
-       Colin Leroy
        Wilbert Berendsen
        Bob Woodside
        Stefaan Eeckels

diff --git a/ChangeLog b/ChangeLog
index d4d6b0464eb8016966e4707d95bf537c0d60c108..e9f4c408f05a12a5ff25b684b6c205cb00705f05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-21
+
+       * version 0.7.5
+
+2002-04-21
+
+       * sylpheed*.png: added new app icons by WAKAI Kazunao (thanks!).
+
 2002-04-21
 
        * src/summaryview.c: summary_show(): fixed a bug that didn't process

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 69a23fc976e69b1728e20579deceaa9b73ff8734..4b812d829448cb875c9fdb27acb9e442b68471c8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,9 @@
-2002-04-22 [alfons]
+2002-04-21 [paul]      0.7.4claws90
+
+       * sync with 0.7.5 release
+               see ChangeLog entry 2002-04-21
+
+2002-04-21 [alfons]
 
        * src/Makefile.am
                add colin's new pixmaps to EXTRA_DIST

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 77bd73d809a49cd890c946b23d91f962ab8645c8..744488ca17a5408a0bb1d94ed6cf6ae6b06436a5 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2002-04-21
+
+       * version 0.7.5
+
+2002-04-21
+
+       * sylpheed*.png: ¼ã°æ¤µ¤ó¤Ë¤è¤ë¿·¤·¤¤ app ¥¢¥¤¥³¥ó¤òÄɲÃ(thanks!)¡£
+
 2002-04-21
 
        * src/summaryview.c: summary_show(): »Ä¤Ã¤¿¥Þ¡¼¥¯¤ò½èÍý¤·¤Ê¤¤¥Ð¥°¤ò

diff --git a/Makefile.am b/Makefile.am
index 5c46e63100faf1e8aa0fc8088da183bd21b46332..793d3210b4095e33d749caefe1d7813f83eed214 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,16 @@ EXTRA_DIST = \
        ChangeLog.jp \
        INSTALL.jp \
        README.jp \
+       ChangeLog.claws \
        README.claws \
        TODO.jp \
        sylpheed.desktop \
        sylpheed.spec \
        sylpheed.spec.in \
-       autogen.sh \
        sylpheed.png \
-       ChangeLog.claws
+       sylpheed-128x128.png \
+       sylpheed-64x64.png \
+       autogen.sh 
 
 if SYLPHEED_GNOME
 pixmapdir=$(gnomedir)/share/pixmaps

diff --git a/NEWS b/NEWS
index 7ee286760f67e10f2c3d9223aa714ec8dffff985..50a8d7cbfb827d9518c1d847074e2ce7a739383f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Changes of Sylpheed
     * Displayed newsgroup names are now abbreviated.
     * The timeout of DNS lookup has been implemented.
     * 'Ctrl-Enter' shortcut now works even if Num Lock is on.
+    * The new application icon has been added.
     * New message checking on IMAP or news server will be aborted immediately
       if some errors occurred.
     * Some menu items have been modified.

diff --git a/ac/Makefile.am b/ac/Makefile.am
index 08d9a7e7dd1ce075aa4e2396d7e346bdd41f7364..b0273d6c9b5538f5ab32cb96d90c1649b7b0b5b2 100644 (file)
--- a/ac/Makefile.am
+++ b/ac/Makefile.am
@@ -4,4 +4,8 @@ MACROS = \
        gnupg-check-typedef.m4 \
         pspell.m4
 
-EXTRA_DIST = $(MACROS)
+EXTRA_DIST = $(MACROS) \
+       missing/gdk-pixbuf.m4 \
+       missing/gettext.m4 \
+       missing/gpgme.m4 \
+       missing/imlib.m4

diff --git a/configure.in b/configure.in
index 0a9e8376f6b6337283f98b510b3b304420511b24..99a97e5e142b683d34a954718fb1a182eaf84399 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws89
+EXTRA_VERSION=claws90
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/sylpheed-128x128.png b/sylpheed-128x128.png
new file mode 100644 (file)
index 0000000..624d8cb
Binary files /dev/null and b/sylpheed-128x128.png differ

diff --git a/sylpheed-64x64.png b/sylpheed-64x64.png
new file mode 100644 (file)
index 0000000..b8c7b87
Binary files /dev/null and b/sylpheed-64x64.png differ

diff --git a/sylpheed.png b/sylpheed.png
index e60c304a47503ff528dc3ba8db89dd9f8582a6d9..f55c8eb323ff99668b98973a8817231ccde682a4 100644 (file)
Binary files a/sylpheed.png and b/sylpheed.png differ