[maemo-commits] [maemo-commits] r10242 - in projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3: . data template

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-02-28 11:18:38 +0200 (Wed, 28 Feb 2007)
New Revision: 10242

Modified:
   projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/ChangeLog
   projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/data/Makefile.am
   projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/template/Makefile.am
Log:
Embed the layout version in the generated gtkrc file.
Do not delete the coordinates.png file in maintainer-clean.


Modified: projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/ChangeLog
===================================================================
--- projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/ChangeLog	2007-02-28 09:14:49 UTC (rev 10241)
+++ projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/ChangeLog	2007-02-28 09:18:38 UTC (rev 10242)
@@ -1,3 +1,11 @@
+2007-02-28  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* data/Makefile.am: Embed the layout version in the generated gtkrc
+	file.
+
+	* template/Makefile.am: Do not delete the coordinates.png file in
+	maintainer-clean.
+
 2007-02-21  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	[3.1.1-1 release]

Modified: projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/data/Makefile.am
===================================================================
--- projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/data/Makefile.am	2007-02-28 09:14:49 UTC (rev 10241)
+++ projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/data/Makefile.am	2007-02-28 09:18:38 UTC (rev 10242)
@@ -13,9 +13,13 @@
 
 gtkrc: 
 	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/gtkrc gtkrc
+	echo "" >> gtkrc
+	echo "# Generated from hildon-theme-layout-3 version `pkg-config --modversion hildon-theme-layout-3`" >> gtkrc
 
 gtkrc.maemo_af_desktop: 
 	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/gtkrc.maemo_af_desktop gtkrc.maemo_af_desktop
+	echo "" >> gtkrc.maemo_af_desktop
+	echo "# Generated from hildon-theme-layout-3 version `pkg-config --modversion hildon-theme-layout-3`" >> gtkrc.maemo_af_desktop
 
 theme.xml: 
 	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/theme.xml theme.xml

Modified: projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/template/Makefile.am
===================================================================
--- projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/template/Makefile.am	2007-02-28 09:14:49 UTC (rev 10241)
+++ projects/haf/branches/hildon-theme-plankton/hildon-theme-plankton-3/template/Makefile.am	2007-02-28 09:18:38 UTC (rev 10242)
@@ -9,7 +9,7 @@
 all: slice.stamp
 
 clean-local:
-	find -iname '*.png' -a ! -iname template.png -exec rm -f '{}' \;
+	find -iname '*.png' -a ! -iname template.png -a ! -name coordinates.png -exec rm -f '{}' \;
 	find -iname '*.jpg' -exec rm -f '{}' \;
 	find -iname '*.jpeg' -exec rm -f '{}' \;