From: Colin Leroy <colin@colino.net>
Date: Thu, 28 Dec 2006 17:58:49 +0000 (+0000)
Subject: 2006-12-28 [colin]	2.6.1cvs86
X-Git-Tag: rel_2_7_0~35
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9828e1ff54e4f413c44bb0a5f0b3f08c3e65a5ce

2006-12-28 [colin]	2.6.1cvs86

	* Makefile.am
		Fix desktop/icon simplification
---

diff --git a/ChangeLog b/ChangeLog
index 813aea8a9..6c5af031a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-28 [colin]	2.6.1cvs86
+
+	* Makefile.am
+		Fix desktop/icon simplification
+
 2006-12-28 [colin]	2.6.1cvs85
 
 	* Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a7ffc34a7..b470dfad6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,14 +39,6 @@ install-data-hook:
                 echo "***   $(gtk_update_icon_cache)";			\
 		echo "***";						\
         fi
-
-else
-if CLAWS_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=claws-mail.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=claws-mail.desktop
-endif
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/PATCHSETS b/PATCHSETS
index 486a682cf..ca8f2860a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2193,3 +2193,4 @@
 ( 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
+( cvs diff -u -r 1.24.2.19 -r 1.24.2.20 Makefile.am;  ) > 2.6.1cvs86.patchset
diff --git a/configure.ac b/configure.ac
index 6cba1a525..be69d75f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=