jhbuild r1840 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Fri Jan 18 16:59:31 2008
New Revision: 1840
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1840&view=rev

Log:
* modulesets/bootstrap.modules, modulesets/gnome-2.22.modules: moved
guile to the bootstrap modulesets, as suggested on desktop-devel-list.
(closes: #510066 which was about a missing guile dependency).



Modified:
   trunk/ChangeLog
   trunk/modulesets/bootstrap.modules
   trunk/modulesets/gnome-2.22.modules

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Fri Jan 18 16:59:31 2008
@@ -71,8 +71,16 @@
 
   <autotools id="waf" autogen-sh="utils/autogen.sh">
     <branch repo="waf.googlecode.com" module="trunk" checkoutdir="waf"/>
+    <dependencies>
+      <dep package="python"/>
+    </dependencies>
   </autotools>
 
+  <tarball id="guile" version="1.8.0">
+    <source href="ftp://ftp.gnu.org/gnu/guile/guile-1.8.0.tar.gz";
+            size="3691677" md5sum="3f47443602f93e94bf43218d9b86099d"/>
+  </tarball>
+
   <metamodule id="meta-bootstrap">
     <dependencies>
       <dep package="gettext" />
@@ -85,6 +93,7 @@
       <dep package="automake-1.10" />
       <dep package="pkg-config" />
       <dep package="python" />
+      <dep package="guile" />
       <dep package="waf" />
     </dependencies>
   </metamodule>

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Fri Jan 18 16:59:31 2008
@@ -788,16 +788,9 @@
       <dep package="glib"/>
     </dependencies>
   </autotools>
-  <tarball id="guile" version="1.8.0">
-    <source href="ftp://ftp.gnu.org/gnu/guile/guile-1.8.0.tar.gz";
-            size="3691677" md5sum="3f47443602f93e94bf43218d9b86099d"/>
-  </tarball>
   <tarball id="autogen" version="5.8.4">
     <source href="http://internap.dl.sourceforge.net/sourceforge/autogen/autogen-5.8.4.tar.bz2";
             size="931015" md5sum="b65d4b9e3ddbcfd5418b708858c05b66"/>
-    <dependencies>
-      <dep package="guile"/>
-    </dependencies>
   </tarball>
   <autotools id="OpenApplet">
     <branch/>