[claws-mail-cvs-commit] Makefile.am

Holger Berndt <[email protected]> Mon, 07 Sep 2009 20:14:18 +0000
Newsgroups gmane.mail.sylpheed.claws.cvs
Message-ID <[email protected]>
Update of /srv/cvs/claws-mail/claws
In directory ran:/tmp/cvs-serv22425

Modified Files:
      Tag: gtk2
	Makefile.am PATCHSETS ChangeLog configure.ac 
Log Message:
2009-09-07 [holger]	3.7.2cvs29

	* Makefile.am
		Also update the icon cache on uninstall.
		This prevents possible problems when Claws Mail was
		uninstalled and installed again into a different location,
		see http://bugzilla.gnome.org/show_bug.cgi?id=362604
		and the blog post linked therein

Index: configure.ac
===================================================================
RCS file: /srv/cvs/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.3922
retrieving revision 1.654.2.3923
diff -u -d -r1.654.2.3922 -r1.654.2.3923
--- configure.ac	7 Sep 2009 19:43:06 -0000	1.654.2.3922
+++ configure.ac	7 Sep 2009 20:14:15 -0000	1.654.2.3923
@@ -12,7 +12,7 @@
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

Index: Makefile.am
===================================================================
RCS file: /srv/cvs/claws-mail/claws/Makefile.am,v
retrieving revision 1.24.2.25
retrieving revision 1.24.2.26
diff -u -d -r1.24.2.25 -r1.24.2.26
--- Makefile.am	13 Dec 2008 21:20:37 -0000	1.24.2.25
+++ Makefile.am	7 Sep 2009 20:14:14 -0000	1.24.2.26
@@ -25,7 +25,10 @@
 if CLAWS_GNOME2
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then					\
                 echo "Updating Gtk icon cache.";			\
                 $(gtk_update_icon_cache);				\

Index: PATCHSETS
===================================================================
RCS file: /srv/cvs/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.3865
retrieving revision 1.1.2.3866
diff -u -d -r1.1.2.3865 -r1.1.2.3866
--- PATCHSETS	7 Sep 2009 19:43:05 -0000	1.1.2.3865
+++ PATCHSETS	7 Sep 2009 20:14:14 -0000	1.1.2.3866
@@ -3853,3 +3853,4 @@
 ( cvs diff -u -r 1.28.2.48 -r 1.28.2.49 src/mbox.c;  ) > 3.7.2cvs26.patchset
 ( cvs diff -u -r 1.382.2.523 -r 1.382.2.524 src/compose.c;  ) > 3.7.2cvs27.patchset
 ( cvs diff -u -r 1.30.2.56 -r 1.30.2.57 src/prefs_toolbar.c;  ) > 3.7.2cvs28.patchset
+( cvs diff -u -r 1.24.2.25 -r 1.24.2.26 Makefile.am;  ) > 3.7.2cvs29.patchset

Index: ChangeLog
===================================================================
RCS file: /srv/cvs/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3015
retrieving revision 1.396.2.3016
diff -u -d -r1.396.2.3015 -r1.396.2.3016
--- ChangeLog	7 Sep 2009 19:43:05 -0000	1.396.2.3015
+++ ChangeLog	7 Sep 2009 20:14:14 -0000	1.396.2.3016
@@ -1,3 +1,12 @@
+2009-09-07 [holger]	3.7.2cvs29
+
+	* Makefile.am
+		Also update the icon cache on uninstall.
+		This prevents possible problems when Claws Mail was
+		uninstalled and installed again into a different location,
+		see http://bugzilla.gnome.org/show_bug.cgi?id=362604
+		and the blog post linked therein
+
 2009-09-07 [paul]	3.7.2cvs28
 
 	* src/prefs_toolbar.c