commit d14322195e71f2355dc8cd5248e7e7a21dc7a7f2
parent 55b0731e456ae9ea9b5c7bfed492c3c1bdca2dcf
Author: Paweł Pękala <c0rn@gazeta.pl>
Date: Tue, 17 Nov 2009 20:01:21 +0000
2009-11-17 [pawel] 3.7.3cvs15
* Makefile.am
Fix Bug 2049 'some icons not copied?'
Install additional 64x64 and 128x128 icons
Diffstat:
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-17 [pawel] 3.7.3cvs15
+
+ * Makefile.am
+ Fix Bug 2049 'some icons not copied?'
+ Install additional 64x64 and 128x128 icons
+
2009-11-17 [holger] 3.7.3cvs14
* src/prefs_toolbar.c
diff --git a/Makefile.am b/Makefile.am
@@ -19,13 +19,26 @@ EXTRA_DIST = \
# hicolor icon theme, base class of all icon themes
pixmapdir=$(datadir)/icons/hicolor/48x48/apps
pixmap_DATA=claws-mail.png
+
+pixmap64dir=$(datadir)/icons/hicolor/64x64/apps
+pixmap64_DATA=claws-mail-64x64.png
+
+pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
+pixmap128_DATA=claws-mail-128x128.png
+
gnomapdir = $(datadir)/applications
gnomap_DATA=claws-mail.desktop
+rename-icons:
+ @cd $(datadir)/icons/hicolor/64x64/apps && \
+ mv claws-mail-64x64.png claws-mail.png
+ @cd $(datadir)/icons/hicolor/128x128/apps && \
+ mv claws-mail-128x128.png claws-mail.png
+
if CLAWS_GNOME2
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-install-data-hook: update-icon-cache
+install-data-hook: rename-icons update-icon-cache
uninstall-hook: update-icon-cache
update-icon-cache:
@@ -38,6 +51,10 @@ update-icon-cache:
echo "*** $(gtk_update_icon_cache)"; \
echo "***"; \
fi
+else
+
+install-data-hook: rename-icons
+
endif
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/PATCHSETS b/PATCHSETS
@@ -3888,3 +3888,4 @@
( cvs diff -u -r 1.12.2.53 -r 1.12.2.54 src/gtk/prefswindow.c; ) > 3.7.3cvs12.patchset
( cvs diff -u -r 1.60.2.134 -r 1.60.2.135 src/addressbook.c; cvs diff -u -r 1.382.2.524 -r 1.382.2.525 src/compose.c; cvs diff -u -r 1.50.2.55 -r 1.50.2.56 src/compose.h; cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/filtering.c; ) > 3.7.3cvs13.patchset
( cvs diff -u -r 1.30.2.57 -r 1.30.2.58 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_toolbar.h; cvs diff -u -r 1.43.2.110 -r 1.43.2.111 src/toolbar.c; cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/toolbar.h; ) > 3.7.3cvs14.patchset
+( cvs diff -u -r 1.24.2.26 -r 1.24.2.27 Makefile.am; ) > 3.7.3cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
