[maemo-commits] [maemo-commits] r14418 - projects/haf/jhbuild_modules

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-10-11 13:48:29 +0300 (Thu, 11 Oct 2007)
New Revision: 14418

Modified:
   projects/haf/jhbuild_modules/ChangeLog
   projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc
   projects/haf/jhbuild_modules/hildon-desktop.modules
Log:
2007-10-11  Xan Lopez  <xan.lopez at nokia.com>

	* hildon-desktop.jhbuildrc:
	* hildon-desktop.modules:

	Drop maemo gtk, update paths to use "hildon" instead of "maemo"


Modified: projects/haf/jhbuild_modules/ChangeLog
===================================================================
--- projects/haf/jhbuild_modules/ChangeLog	2007-10-11 09:53:38 UTC (rev 14417)
+++ projects/haf/jhbuild_modules/ChangeLog	2007-10-11 10:48:29 UTC (rev 14418)
@@ -1,3 +1,10 @@
+2007-10-11  Xan Lopez  <xan.lopez at nokia.com>
+
+	* hildon-desktop.jhbuildrc:
+	* hildon-desktop.modules:
+
+	Drop maemo gtk, update paths to use "hildon" instead of "maemo"
+
 2007-10-01  Murray Cumming <murrayc at murrayc.com>
 
 	* maemo.modules: Correct the gnome and gtkmm repository details, which now use svn 

Modified: projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc
===================================================================
--- projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc	2007-10-11 09:53:38 UTC (rev 14417)
+++ projects/haf/jhbuild_modules/hildon-desktop.jhbuildrc	2007-10-11 10:48:29 UTC (rev 14418)
@@ -4,8 +4,8 @@
 
 modules = [ 'meta-hildon-desktop' ]
 
-checkoutroot = os.path.expanduser('~/Code/maemo')
+checkoutroot = os.path.expanduser('~/code/hildon')
 
-prefix = '/opt/maemo'
+prefix = '/opt/hildon'
 
 os.environ['PKG_CONFIG_PATH'] = "/usr/lib/pkgconfig:/usr/share/pkgconfig"

Modified: projects/haf/jhbuild_modules/hildon-desktop.modules
===================================================================
--- projects/haf/jhbuild_modules/hildon-desktop.modules	2007-10-11 09:53:38 UTC (rev 14417)
+++ projects/haf/jhbuild_modules/hildon-desktop.modules	2007-10-11 10:48:29 UTC (rev 14418)
@@ -24,16 +24,9 @@
   </autotools>
   -->
 
-  <autotools id="gtk+">
-    <branch repo="maemo.org-haf" module="trunk/gtk+"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <autotools id="libhildon" autogenargs="--with-maemo-gtk=no">
     <branch repo="maemo.org-haf" module="trunk/hildon-1"/>
     <dependencies>
-      <!--<dep package="gtk+"/>-->
     </dependencies>
   </autotools>
 
@@ -41,7 +34,6 @@
     <branch repo="maemo.org-haf" module="trunk/hildon-desktop"/>
     <dependencies>
       <dep package="libhildon"/>
-      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -72,7 +64,6 @@
   <autotools id="sapwood">
     <branch repo="maemo.org-haf" module="trunk/sapwood"/>
     <dependencies>
-      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -99,7 +90,6 @@
 
   <metamodule id="meta-hildon-desktop">
     <dependencies>
-      <dep package="gtk+"/>
       <dep package="libhildon"/>
       <dep package="meta-hildon-theme"/>
       <dep package="matchbox-window-manager"/>