[jhbuild] 3.6: nautilus requires tracker

[Stefan Walter <stefw src gnome org>]

commit ca4020679b579f102d31352ce6aadf1106a7ebe1
Author: Stef Walter <stefw gnome org>
Date:   Fri Aug 3 09:35:27 2012 +0200

    3.6: nautilus requires tracker
    
     * nautilus requires tracker-sparql-0.14
     * Remove tracker dependency on tracker, otherwise this would
       result in a circular dependency
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681113

 modulesets/gnome-suites-core-3.6.modules      |    4 +---
 modulesets/gnome-suites-core-deps-3.6.modules |    3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 2b11b64..17befc9 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -777,10 +777,8 @@
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-    <after>
       <dep package="tracker"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="sushi">
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 691c843..ffe85f6 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -953,7 +953,7 @@
 
   <!-- evolution miner broken:
        https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
-  <autotools id="tracker" autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no --enable-miner-evolution=no" check-target="false">
+  <autotools id="tracker" autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no --enable-miner-evolution=no --disable-nautilus-extension" check-target="false">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -963,7 +963,6 @@
     <suggests>
       <dep package="libgnome-keyring"/>
       <dep package="gstreamer"/>
-      <dep package="nautilus"/>
       <dep package="NetworkManager"/>
       <dep package="evolution"/>
       <dep package="upower"/>