[maemo-commits] [maemo-commits] r8498 - in projects/haf/trunk/hildon-theme-layout-3: . data pkgconfig

[From: www-data at stage.maemo.org]

Author: mdk
Date: 2006-11-30 14:32:44 +0200 (Thu, 30 Nov 2006)
New Revision: 8498

Removed:
   projects/haf/trunk/hildon-theme-layout-3/scripts/
Modified:
   projects/haf/trunk/hildon-theme-layout-3/ChangeLog
   projects/haf/trunk/hildon-theme-layout-3/Makefile.am
   projects/haf/trunk/hildon-theme-layout-3/configure.ac
   projects/haf/trunk/hildon-theme-layout-3/data/layout.txt
   projects/haf/trunk/hildon-theme-layout-3/pkgconfig/hildon-theme-layout-3.pc.in
Log:
Updating with VKB key (forgoten merge from tigert).
More subst stuff in pkgconfig.
Removing scripts.


Modified: projects/haf/trunk/hildon-theme-layout-3/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/ChangeLog	2006-11-30 12:27:52 UTC (rev 8497)
+++ projects/haf/trunk/hildon-theme-layout-3/ChangeLog	2006-11-30 12:32:44 UTC (rev 8498)
@@ -1,6 +1,16 @@
 2006-11-30  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* data/layout.txt: Updating with VKB key (forgoten merge from tigert).
+
+	* pkgconfig/hildon-theme-layout-3.pc.in: More subst stuff.
+
 	* Makefile.am:
+	* configure.ac: 
+	* scripts: Removing.
+
+2006-11-30  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* Makefile.am:
 	* configure.ac:
 	* data:
 	* data/Makefile.am: Introducing the data directory.

Modified: projects/haf/trunk/hildon-theme-layout-3/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/Makefile.am	2006-11-30 12:27:52 UTC (rev 8497)
+++ projects/haf/trunk/hildon-theme-layout-3/Makefile.am	2006-11-30 12:32:44 UTC (rev 8498)
@@ -1,4 +1,4 @@
-SUBDIRS				= scripts rc pkgconfig data
+SUBDIRS				= rc pkgconfig data
 
 MAINTAINERCLEANFILES		= Makefile.in aclocal.m4 configure 	\
 			  	  config.h.in compile 			\

Modified: projects/haf/trunk/hildon-theme-layout-3/configure.ac
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/configure.ac	2006-11-30 12:27:52 UTC (rev 8497)
+++ projects/haf/trunk/hildon-theme-layout-3/configure.ac	2006-11-30 12:32:44 UTC (rev 8498)
@@ -7,7 +7,6 @@
 AC_OUTPUT([Makefile                             \
            scripts/Makefile                     \
 	   rc/Makefile                          \
-           scripts/hildon-theme-install-3       \
            pkgconfig/hildon-theme-layout-3.pc   \
            pkgconfig/Makefile                   \
            data/Makefile])

Modified: projects/haf/trunk/hildon-theme-layout-3/data/layout.txt
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/data/layout.txt	2006-11-30 12:27:52 UTC (rev 8497)
+++ projects/haf/trunk/hildon-theme-layout-3/data/layout.txt	2006-11-30 12:32:44 UTC (rev 8498)
@@ -77,6 +77,9 @@
 HomeFrameResize=7960,768,30,10
 HomeFrameReject=7960,780,30,10
 
+# Virtual keyboard
+VKBButtonTextColor=7607,13,30,10
+
 [Elements]
 qgn_plat_view_button.png=7496,55,30,30
 qgn_plat_view_button_w.png=7526,55,30,30

Modified: projects/haf/trunk/hildon-theme-layout-3/pkgconfig/hildon-theme-layout-3.pc.in
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/pkgconfig/hildon-theme-layout-3.pc.in	2006-11-30 12:27:52 UTC (rev 8497)
+++ projects/haf/trunk/hildon-theme-layout-3/pkgconfig/hildon-theme-layout-3.pc.in	2006-11-30 12:32:44 UTC (rev 8498)
@@ -1,9 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-pkgdatadir=@datadir@/hildon-theme-layout-3/
-commonrcfilesdir=@datadir@/hildon-theme-layout-3/commonrcfiles
+pkgdatadir=@datadir@/@PACKAGE@/
 
-Name: hildon-theme-layout-3
+Name: @PACKAGE@
 Description: Hildon theme layout version 3
 Version: @VERSION@