2004-12-04 [paul] 0.9.12cvs182.2

	* src/Makefile.am
		remove 'pixmaps/dir_noselect.xpm'. from local patch,
	 	committed in error

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d3a8fc037a8fc7b98219b82f01e303de047952bb..f2ce55614d5636ed32585c220aae7ce2d62c909b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-12-04 [paul]      0.9.12cvs182.2
+
+       * src/Makefile.am
+               remove 'pixmaps/dir_noselect.xpm'. from local patch,
+               committed in error      
+
 2004-12-04 [paul]      0.9.12cvs182.1
 
        * ChangeLog

diff --git a/PATCHSETS b/PATCHSETS
index 0bf698604a63e7016afa94a1aca9f2adf31f10d8..f4a7c1ede5b587820877b45b2c1690265830d96d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -273,3 +273,4 @@
 ( cvs diff -u -r 1.382.2.76 -r 1.382.2.77 src/compose.c; ) > 0.9.12cvs179.1.patchset
 ( cvs diff -u -r 1.396.2.13 -r 1.396.2.14 ChangeLog; cvs diff -u -r 1.2504.2.34 -r 1.2504.2.35 ChangeLog.claws; cvs diff -u -r 1.391.2.13 -r 1.391.2.14 ChangeLog.jp; cvs diff -u -r 1.654.2.305 -r 1.654.2.306 configure.ac; cvs diff -u -r 1.155.2.14 -r 1.155.2.15 src/Makefile.am; cvs diff -u -r 1.56.2.29 -r 1.56.2.30 src/pop.c; cvs diff -u -r 1.36.2.16 -r 1.36.2.17 src/common/utils.c; cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/common/utils.h; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/continue.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/dir_close.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/dir_open.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/drafts_close.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/drafts_open.xpm; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/folder.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/group.xpm; cvs diff -u -r 1.2 -r 1.3 src/pixmaps/unread.xpm; ) > 0.9.12cvs180.1.patchset
 ( cvs diff -u -r 1.396.2.14 -r 1.396.2.15 ChangeLog; cvs diff -u -r 1.2504.2.35 -r 1.2504.2.36 ChangeLog.claws; cvs diff -u -r 1.391.2.14 -r 1.391.2.15 ChangeLog.jp; cvs diff -u -r 1.29.2.2 -r 1.29.2.3 INSTALL; cvs diff -u -r 1.42.2.5 -r 1.42.2.6 NEWS; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 README; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 README.jp; cvs diff -u -r 1.654.2.306 -r 1.654.2.307 configure.ac; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/Makefile.am; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-1.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-10.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-11.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-12.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-13.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-14.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-15.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-16.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-17.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-18.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-19.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-2.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-20.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-3.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-4.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-5.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-6.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-7.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-8.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-9.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed.sgml; cvs diff -u -r 1.58.2.4 -r 1.58.2.5 po/de.po; cvs diff -u -r 1.155.2.15 -r 1.155.2.16 src/Makefile.am; cvs diff -u -r 1.382.2.77 -r 1.382.2.78 src/compose.c; cvs diff -u -r 1.49.2.24 -r 1.49.2.25 src/procmime.c; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/regular.xpm; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/prefs_gpg.c; ) > 0.9.12cvs182.1.patchset
+( cvs diff -u -r 1.155.2.16 -r 1.155.2.17 src/Makefile.am; ) > 0.9.12cvs182.2.patchset

diff --git a/configure.ac b/configure.ac
index 1ad6b35b6e81cae23db07a61c2c052d5518cc655..d846c386779f76da7e16b747c11ace1c6661a2c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=182
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e41d6607fa2047ce2f929c1ba72148a4b3045d3..2f88d93b9fb85b2854c857dbfc7c86278cc92db6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -272,7 +272,6 @@ EXTRA_DIST = \
        pixmaps/continue.xpm \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
-       pixmaps/dir_noselect.xpm \
        pixmaps/dir_open_hrm.xpm \
        pixmaps/dir_open.xpm \
        pixmaps/down_arrow.xpm \