jhbuild r2614 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Sat Jan  3 15:02:37 2009
New Revision: 2614
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2614&view=rev

Log:
* modulesets/gnome-suites-2.26.modules: removed hard dependency of glib
on shared-mime-info, as shared-mime-info has a real build dependency on
glib, and it caused a dependency cycle; added shared-mime-info as
<after> for both glib and gtk+ to get back to the situation before glib
and gtk+ deps shuffleing.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-suites-2.26.modules

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Sat Jan  3 15:02:37 2009
@@ -79,8 +79,10 @@
     <branch/>
     <dependencies>
       <dep package="gtk-doc"/>
-      <dep package="shared-mime-info"/>
     </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
   <autotools id="gnome-mime-data">
@@ -115,6 +117,9 @@
       <dep package="pango"/>
       <dep package="atk"/>
     </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
   <autotools id="gtk-doc">