2009-11-17 [pawel] 3.7.3cvs15

	* Makefile.am
		Fix Bug 2049 'some icons not copied?'
		Install additional 64x64 and 128x128 icons

diff --git a/ChangeLog b/ChangeLog
index b5d5cb5b97286dadd9bd6de7ef082d77af4bb1b5..229b62ea5f7cb22e109d188d81414e8ac1e81cba 100644 (file)
--- 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
 2009-11-17 [holger]    3.7.3cvs14
 
        * src/prefs_toolbar.c

diff --git a/Makefile.am b/Makefile.am
index 2e0e5d4618dbbc9f46e31c953dd279ff7cca6bd8..a91fed0770d6196436795ebaf8ac184d16d6af76 100644 (file)
--- 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
 # 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
 
 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
 
 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:
 uninstall-hook: update-icon-cache
 
 update-icon-cache:


@@ -38,6 +51,10 @@ update-icon-cache:
                 echo "***   $(gtk_update_icon_cache)";                 \
                echo "***";                                             \
         fi
                 echo "***   $(gtk_update_icon_cache)";                 \
                echo "***";                                             \
         fi

+else
+
+install-data-hook: rename-icons
+

 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/PATCHSETS b/PATCHSETS
index d222e57708390bf11811ff1ee5a2e268da5b598b..338a685b6ebea99eafb6760368e2fc6a70665dec 100644 (file)
--- 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.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
index 8d783b8bd5904d649fd590b9cbf8cccb4e901eae..1d6fc74ca1a67d351b79b437343deaadbc6f1f1a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=14
+EXTRA_VERSION=15

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=