2006-12-28 [colin] 2.6.1cvs86
authorColin Leroy <colin@colino.net>
Thu, 28 Dec 2006 17:58:49 +0000 (17:58 +0000)
committerColin Leroy <colin@colino.net>
Thu, 28 Dec 2006 17:58:49 +0000 (17:58 +0000)
* Makefile.am
Fix desktop/icon simplification

ChangeLog
Makefile.am
PATCHSETS
configure.ac

index 813aea8..6c5af03 100644 (file)
--- 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
index a7ffc34..b470dfa 100644 (file)
@@ -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
index 486a682..ca8f286 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 6cba1a5..be69d75 100644 (file)
@@ -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=