CVS: sylpheedclaws/sylpheed-claws Makefile.am,1.24.2.18,1.24.2.19 PATCHSETS,1.1.2.2203,1.1.2.2204 ChangeLog,1.396.2.1306,1.396.2.1307 configure.ac,1.654.2.2246,1.654.2.2247

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws
In directory sunsite.dk:/tmp/cvs-serv7240

Modified Files:
      Tag: gtk2
	Makefile.am PATCHSETS ChangeLog configure.ac 
Log Message:
2006-12-28 [colin]	2.6.1cvs85

	* Makefile.am
		Make desktop and icon not 
		dependant on the desktop

Index: Makefile.am
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/Makefile.am,v
retrieving revision 1.24.2.18
retrieving revision 1.24.2.19
diff -u -d -r1.24.2.18 -r1.24.2.19
--- Makefile.am	2006/12/18 17:21:16	1.24.2.18
+++ Makefile.am	2006/12/28 17:11:39	1.24.2.19
@@ -20,13 +20,13 @@
 	claws-mail.png \
 	autogen.sh
 
-if CLAWS_GNOME2
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA=claws-mail.png
 gnomapdir = $(datadir)/applications
 gnomap_DATA=claws-mail.desktop
 
+if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:
@@ -46,11 +46,6 @@
 pixmap_DATA=claws-mail.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=claws-mail.desktop
-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=
 endif
 endif
 

Index: PATCHSETS
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/PATCHSETS,v
retrieving revision 1.1.2.2203
retrieving revision 1.1.2.2204
diff -u -d -r1.1.2.2203 -r1.1.2.2204
--- PATCHSETS	2006/12/28 12:42:54	1.1.2.2203
+++ PATCHSETS	2006/12/28 17:11:39	1.1.2.2204
@@ -2192,3 +2192,4 @@
 ( cvs diff -u -r 1.204.2.115 -r 1.204.2.116 src/prefs_common.c;  cvs diff -u -r 1.103.2.72 -r 1.103.2.73 src/prefs_common.h;  cvs diff -u -r 1.60.2.72 -r 1.60.2.73 src/addressbook.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/addressitem.h;  ) > 2.6.1cvs82.patchset
 ( cvs diff -u -r 1.52.2.30 -r 1.52.2.31 src/prefs_folder_item.c;  ) > 2.6.1cvs83.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/claws.def;  ) > 2.6.1cvs84.patchset
+( cvs diff -u -r 1.24.2.18 -r 1.24.2.19 Makefile.am;  ) > 2.6.1cvs85.patchset

Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/ChangeLog,v
retrieving revision 1.396.2.1306
retrieving revision 1.396.2.1307
diff -u -d -r1.396.2.1306 -r1.396.2.1307
--- ChangeLog	2006/12/28 12:42:55	1.396.2.1306
+++ ChangeLog	2006/12/28 17:11:41	1.396.2.1307
@@ -1,3 +1,9 @@
+2006-12-28 [colin]	2.6.1cvs85
+
+	* Makefile.am
+		Make desktop and icon not 
+		dependant on the desktop
+
 2006-12-28 [wwp]	2.6.1cvs84
 
 	* src/plugins/pgpmime/claws.def

Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/configure.ac,v
retrieving revision 1.654.2.2246
retrieving revision 1.654.2.2247
diff -u -d -r1.654.2.2246 -r1.654.2.2247
--- configure.ac	2006/12/28 12:42:57	1.654.2.2246
+++ configure.ac	2006/12/28 17:11:46	1.654.2.2247
@@ -11,7 +11,7 @@
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=