2006-12-28 [colin] 2.6.1cvs85

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

diff --git a/ChangeLog b/ChangeLog
index ab1bca1df2388e2eff28e6166793a21b877408f6..813aea8a9d59496de4ac337ffc2a7ff50c1f05f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 2006-12-28 [wwp]       2.6.1cvs84
 
        * src/plugins/pgpmime/claws.def

diff --git a/Makefile.am b/Makefile.am
index 7eeb31e6b43742ae816fb42adc653b8c2cfb8310..a7ffc34a7cc594c19b9fe07f2cd8f01497e72a31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,13 +20,13 @@ EXTRA_DIST = \
        claws-mail.png \
        autogen.sh
 
        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
 
 # 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:
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook:


@@ -46,11 +46,6 @@ pixmapdir=$(gnomedatadir)/pixmaps
 pixmap_DATA=claws-mail.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=claws-mail.desktop
 pixmap_DATA=claws-mail.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
 gnomap_DATA=claws-mail.desktop

-else
-pixmapdir=
-pixmap_DATA=
-gnomapdir=
-gnomap_DATA=

 endif
 endif
 
 endif
 endif
 

diff --git a/PATCHSETS b/PATCHSETS
index 74906a9afbde459afde06af256627d68eae35e7f..486a682cf9e10c707bf212ed5a2337e72603cfdc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -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.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

diff --git a/configure.ac b/configure.ac
index b6bdbeb0e58842f8bd93472bef47c24813f4540e..6cba1a5250c74f1b59ea8e3bd1e7615778a4c819 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=84
+EXTRA_VERSION=85

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=