CVS: sylpheedclaws/sylpheed-claws ChangeLog,1.396.2.1135.2.27,1.396.2.1135.2.28 Makefile.am,1.24.2.14.4.1,1.24.2.14.4.2 PATCHSETS,1.1.2.2037.2.25,1.1.2.2037.2.26 configure.ac,1.654.2.2080.2.26,1.654.2.2080.2.27
[email protected] Mon, 04 Dec 2006 14:21:49 +0000
Newsgroups
gmane.mail.sylpheed.claws.cvs
Message-ID
<[email protected] >
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws
In directory sunsite.dk:/tmp/cvs-serv28725
Modified Files:
Tag: stable_2_6
ChangeLog Makefile.am PATCHSETS configure.ac
Log Message:
2006-12-04 [paul] 2.6.0cvs25-stable
* ChangeLog
* Makefile.am
* configure.ac
* m4/aclocal-include.m4
* m4/check-type.m4
* src/Makefile.am
* src/addr_compl.c
* src/compose.c
* src/crash.c
* src/export.c
* src/exporthtml.c
* src/exportldif.c
* src/imap.c
* src/import.c
* src/main.c
* src/main.h
* src/matcher.c
* src/mimeview.c
* src/procmsg.c
* src/common/Makefile.am
* src/common/claws.c
* src/common/claws.h
* src/common/ssl.c
* src/common/sylpheed.c
* src/common/sylpheed.h
* src/etpan/Makefile.am
* src/gtk/Makefile.am
* src/gtk/claws-marshal.list
* src/gtk/filesel.c
* src/gtk/gtksctree.c
* src/gtk/quicksearch.c
* src/gtk/sylpheed-marshal.list
* src/plugins/bogofilter/bogofilter.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/clamav/clamav_plugin.c
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/demo/demo.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpcore/claws.def
* src/plugins/pgpcore/pgp_viewer.c
* src/plugins/pgpcore/plugin.c
* src/plugins/pgpcore/sylpheed.def
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpinline/claws.def
* src/plugins/pgpinline/plugin.c
* src/plugins/pgpinline/sylpheed.def
* src/plugins/pgpmime/Makefile.am
* src/plugins/pgpmime/claws.def
* src/plugins/pgpmime/plugin.c
* src/plugins/pgpmime/sylpheed.def
* src/plugins/spamassassin/spamassassin.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
backport from 2.6.0cvs64:
yet more renaming
Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/ChangeLog,v
retrieving revision 1.396.2.1135.2.27
retrieving revision 1.396.2.1135.2.28
diff -u -d -r1.396.2.1135.2.27 -r1.396.2.1135.2.28
--- ChangeLog 2006/12/04 10:48:22 1.396.2.1135.2.27
+++ ChangeLog 2006/12/04 14:21:31 1.396.2.1135.2.28
@@ -1,6 +1,61 @@
-2006-12-04 [paul] 2.6.1
+2006-12-04 [paul] 2.6.0cvs25-stable
- Claws Mail 2.6.1 released
+ * ChangeLog
+ * Makefile.am
+ * configure.ac
+ * m4/aclocal-include.m4
+ * m4/check-type.m4
+ * src/Makefile.am
+ * src/addr_compl.c
+ * src/compose.c
+ * src/crash.c
+ * src/export.c
+ * src/exporthtml.c
+ * src/exportldif.c
+ * src/imap.c
+ * src/import.c
+ * src/main.c
+ * src/main.h
+ * src/matcher.c
+ * src/mimeview.c
+ * src/procmsg.c
+ * src/common/Makefile.am
+ * src/common/claws.c
+ * src/common/claws.h
+ * src/common/ssl.c
+ * src/common/sylpheed.c
+ * src/common/sylpheed.h
+ * src/etpan/Makefile.am
+ * src/gtk/Makefile.am
+ * src/gtk/claws-marshal.list
+ * src/gtk/filesel.c
+ * src/gtk/gtksctree.c
+ * src/gtk/quicksearch.c
+ * src/gtk/sylpheed-marshal.list
+ * src/plugins/bogofilter/bogofilter.c
+ * src/plugins/bogofilter/bogofilter_gtk.c
+ * src/plugins/clamav/clamav_plugin.c
+ * src/plugins/clamav/clamav_plugin_gtk.c
+ * src/plugins/demo/demo.c
+ * src/plugins/dillo_viewer/dillo_viewer.c
+ * src/plugins/pgpcore/Makefile.am
+ * src/plugins/pgpcore/claws.def
+ * src/plugins/pgpcore/pgp_viewer.c
+ * src/plugins/pgpcore/plugin.c
+ * src/plugins/pgpcore/sylpheed.def
+ * src/plugins/pgpinline/Makefile.am
+ * src/plugins/pgpinline/claws.def
+ * src/plugins/pgpinline/plugin.c
+ * src/plugins/pgpinline/sylpheed.def
+ * src/plugins/pgpmime/Makefile.am
+ * src/plugins/pgpmime/claws.def
+ * src/plugins/pgpmime/plugin.c
+ * src/plugins/pgpmime/sylpheed.def
+ * src/plugins/spamassassin/spamassassin.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ * src/plugins/trayicon/trayicon.c
+ backport from 2.6.0cvs64:
+ yet more renaming
2006-12-04 [paul] 2.6.0cvs24-stable
Index: Makefile.am
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/Makefile.am,v
retrieving revision 1.24.2.14.4.1
retrieving revision 1.24.2.14.4.2
diff -u -d -r1.24.2.14.4.1 -r1.24.2.14.4.2
--- Makefile.am 2006/11/24 12:49:41 1.24.2.14.4.1
+++ Makefile.am 2006/12/04 14:21:36 1.24.2.14.4.2
@@ -20,7 +20,7 @@
claws-mail.png \
autogen.sh
-if SYLPHEED_GNOME2
+if CLAWS_GNOME2
# hicolor icon theme, base class of all icon themes
pixmapdir=$(datadir)/icons/hicolor/48x48/apps
pixmap_DATA=claws-mail.png
@@ -41,7 +41,7 @@
fi
else
-if SYLPHEED_GNOME
+if CLAWS_GNOME
pixmapdir=$(gnomedatadir)/pixmaps
pixmap_DATA=claws-mail.png
gnomapdir=$(gnomedatadir)/gnome/apps/Internet
@@ -57,6 +57,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = claws-mail.pc
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
config.h
Index: PATCHSETS
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/PATCHSETS,v
retrieving revision 1.1.2.2037.2.25
retrieving revision 1.1.2.2037.2.26
diff -u -d -r1.1.2.2037.2.25 -r1.1.2.2037.2.26
--- PATCHSETS 2006/12/04 08:18:29 1.1.2.2037.2.25
+++ PATCHSETS 2006/12/04 14:21:37 1.1.2.2037.2.26
@@ -2049,3 +2049,4 @@
( cvs diff -u -r 1.3.2.17.4.1 -r 1.3.2.17.4.2 src/exphtmldlg.c; cvs diff -u -r 1.1.4.19.10.1 -r 1.1.4.19.10.2 src/expldifdlg.c; ) > 2.6.0cvs22.patchset
( cvs diff -u -r 1.36.2.86.2.2 -r 1.36.2.86.2.3 src/common/utils.c; ) > 2.6.0cvs23.patchset
( cvs diff -u -r 1.36.2.86.2.3 -r 1.36.2.86.2.4 src/common/utils.c; ) > 2.6.0cvs24.patchset
+( cvs diff -u -r 1.396.2.1135.2.27 -r 1.396.2.1135.2.28 ChangeLog; cvs diff -u -r 1.24.2.14.4.1 -r 1.24.2.14.4.2 Makefile.am; cvs diff -u -r 1.654.2.2080.2.26 -r 1.654.2.2080.2.27 configure.ac; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 m4/aclocal-include.m4; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 m4/check-type.m4; cvs diff -u -r 1.155.2.43.2.1 -r 1.155.2.43.2.2 src/Makefile.am; cvs diff -u -r 1.27.2.23.2.1 -r 1.27.2.23.2.2 src/addr_compl.c; cvs diff -u -r 1.382.2.321.2.8 -r 1.382.2.321.2.9 src/compose.c; cvs diff -u -r 1.23.2.17.8.1 -r 1.23.2.17.8.2 src/crash.c; cvs diff -u -r 1.8.2.20.2.1 -r 1.8.2.20.2.2 src/export.c; cvs diff -u -r 1.5.2.13.6.1 -r 1.5.2.13.6.2 src/exporthtml.c; cvs diff -u -r 1.1.4.11.6.1 -r 1.1.4.11.6.2 src/exportldif.c; cvs diff -u -r 1.179.2.137.2.1 -r 1.179.2.137.2.2 src/imap.c; cvs diff -u -r 1.13.2.18.4.1 -r 1.13.2.18.4.2 src/import.c; cvs diff -u -r 1.115.2.11
0.2.1 -r 1.115.2.110.2.2 src/main.c; cvs diff -u -r 1.7.2.4.4.1 -r 1.7.2.4.4.2 src/main.h; cvs diff -u -r 1.75.2.31.4.1 -r 1.75.2.31.4.2 src/matcher.c; cvs diff -u -r 1.83.2.91.2.1 -r 1.83.2.91.2.2 src/mimeview.c; cvs diff -u -r 1.150.2.81.2.1 -r 1.150.2.81.2.2 src/procmsg.c; cvs diff -u -r 1.24.2.10 -r 1.24.2.11 src/common/Makefile.am; diff -u /dev/null src/common/claws.c; diff -u /dev/null src/common/claws.h; cvs diff -u -r 1.9.2.15.4.1 -r 1.9.2.15.4.2 src/common/ssl.c; cvs diff -u -r -1.7.2.9.2.1 -r -1.7.2.9.2.2 src/common/sylpheed.c; cvs diff -u -r -1.5.2.3.10.1 -r -1.5.2.3.10.2 src/common/sylpheed.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/Makefile.am; cvs diff -u -r 1.20.2.9.4.1 -r 1.20.2.9.4.2 src/gtk/Makefile.am; diff -u /dev/null src/gtk/claws-marshal.list; cvs diff -u -r 1.2.2.25.4.1 -r 1.2.2.25.4.2 src/gtk/filesel.c; cvs diff -u -r 1.1.4.34.2.1 -r 1.1.4.34
.2.2 src/gtk/gtksctree.c; cvs diff -u -r 1.1.2.50.2.1 -r 1.1.2.50.2.2 src/gtk/quicksearch.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.list; cvs diff -u -r 1.1.2.10.4.1 -r 1.1.2.10.4.2 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.3.4.1 -r 1.1.2.3.4.2 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.13.2.25.4.1 -r 1.13.2.25.4.2 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.9.2.20.4.1 -r 1.9.2.20.4.2 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.13.2.9.4.1 -r 1.13.2.9.4.2 src/plugins/demo/demo.c; cvs diff -u -r 1.12.2.15.4.1 -r 1.12.2.15.4.2 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.6.2.1 -r 1.1.2.6.2.2 src/plugins/pgpcore/Makefile.am; diff -u /dev/null src/plugins/pgpcore/claws.def; cvs diff -u -r 1.1.2.7.2.1 -r 1.1.2.7.2.2 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.12.2.1 -r 1.1.2.12.
2.2 src/plugins/pgpcore/plugin.c; cvs diff -u -r -1.1.2.4.4.1 -r -1.1.2.4.4.2 src/plugins/pgpcore/sylpheed.def; cvs diff -u -r 1.1.2.5.10.1 -r 1.1.2.5.10.2 src/plugins/pgpinline/Makefile.am; diff -u /dev/null src/plugins/pgpinline/claws.def; cvs diff -u -r 1.1.2.10.4.1 -r 1.1.2.10.4.2 src/plugins/pgpinline/plugin.c; cvs diff -u -r -1.1.2.5.4.1 -r -1.1.2.5.4.2 src/plugins/pgpinline/sylpheed.def; cvs diff -u -r 1.1.2.7.10.1 -r 1.1.2.7.10.2 src/plugins/pgpmime/Makefile.am; diff -u /dev/null src/plugins/pgpmime/claws.def; cvs diff -u -r 1.1.2.20.4.1 -r 1.1.2.20.4.2 src/plugins/pgpmime/plugin.c; cvs diff -u -r -1.1.2.4.4.1 -r -1.1.2.4.4.2 src/plugins/pgpmime/sylpheed.def; cvs diff -u -r 1.18.2.42.4.1 -r 1.18.2.42.4.2 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.30.6.1 -r 1.23.2.30.6.2 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.40.2.1 -r
1.14.2.40.2.2 src/plugins/trayicon/trayicon.c; ) > 2.6.0cvs25.patchset
Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/configure.ac,v
retrieving revision 1.654.2.2080.2.26
retrieving revision 1.654.2.2080.2.27
diff -u -d -r1.654.2.2080.2.26 -r1.654.2.2080.2.27
--- configure.ac 2006/12/04 10:48:29 1.654.2.2080.2.26
+++ configure.ac 2006/12/04 14:21:39 1.654.2.2080.2.27
@@ -8,10 +8,10 @@
dnl version number
MAJOR_VERSION=2
MINOR_VERSION=6
-MICRO_VERSION=1
+MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=25
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=-stable
@@ -47,11 +47,11 @@
fi
AC_SUBST(gnomedatadir)
fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
+AM_CONDITIONAL(CLAWS_GNOME, test -n "$gnomedatadir")
dnl GNOME 2.x installed?
PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
-AM_CONDITIONAL(SYLPHEED_GNOME2, test x"$ac_enable_gnome2" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOME2, test x"$ac_enable_gnome2" = x"yes")
dnl Claws version
AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
@@ -87,7 +87,7 @@
AC_LIBTOOL_RC
AC_PROG_LIBTOOL
-SYLPHEED_ACLOCAL_INCLUDE(m4)
+CLAWS_ACLOCAL_INCLUDE(m4)
dnl ******************************
dnl Checks for host
@@ -284,7 +284,7 @@
dnl AC_CHECK_TYPE(wint_t, unsigned int) does not work because wint_t
dnl may be defined only in wchar.h (this happens with gcc-2.96).
dnl So we need to use this extended macro.
-SYLPHEED_CHECK_TYPE(wint_t, unsigned int,
+CLAWS_CHECK_TYPE(wint_t, unsigned int,
[
#if HAVE_WCHAR_H
#include <wchar.h>
@@ -808,7 +808,7 @@
else
AC_MSG_RESULT(no)
fi
-AM_CONDITIONAL(SYLPHEED_LIBETPAN, test "x$libetpan_result" = "xyes")
+AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
dnl Libgnomeprint
@@ -830,7 +830,7 @@
else
AC_MSG_RESULT(no)
fi
-AM_CONDITIONAL(SYLPHEED_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
dnl ****************************
dnl ** Final configure output **