[jhbuild] 3.2: move sushi to core (and gtksourceview to core deps)

[Frederic Peters <fpeters src gnome org>]

commit f8e5942cc3cae21be59bcb96a64a0f4211a788ce
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Fri Sep 2 11:21:43 2011 +0200

    3.2: move sushi to core (and gtksourceview to core deps)

 modulesets/gnome-apps-3.2.modules             |   31 -------------------------
 modulesets/gnome-suites-core-3.2.modules      |   20 ++++++++++++++++
 modulesets/gnome-suites-core-deps-3.2.modules |   10 ++++++++
 3 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 0e34eab..258cab4 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -164,16 +164,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="shared-mime-info"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
@@ -182,7 +172,6 @@
     </dependencies>
   </autotools>
 
-
   <tarball id="gtk-vnc" version="0.4.3" autogenargs="--with-gtk=3.0">
     <source href="http://download.gnome.org/sources/gtk-vnc/0.4/gtk-vnc-0.4.3.tar.bz2";
             hash="sha256:b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377"
@@ -1012,25 +1001,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="sushi">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gjs"/>
-      <dep package="libmusicbrainz"/>
-      <dep package="evince"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="clutter-gst"/>
-      <dep package="gtksourceview"/>
-      <dep package="WebKit"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="tomboy">
     <branch/>
     <dependencies>
@@ -1091,7 +1061,6 @@
       <dep package="orca"/>
       <dep package="rygel"/>
       <dep package="seahorse"/>
-      <dep package="sushi"/>
       <dep package="totem"/>
       <dep package="vinagre"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-3.2.modules b/modulesets/gnome-suites-core-3.2.modules
index b0627c8..b674bab 100644
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@ -684,6 +684,25 @@
     </after>
   </autotools>
 
+  <autotools id="sushi">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gjs"/>
+      <dep package="libmusicbrainz"/>
+      <dep package="evince"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="clutter-gst"/>
+      <dep package="gtksourceview"/>
+      <dep package="WebKit"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="totem">
     <branch />
     <dependencies>
@@ -905,6 +924,7 @@
       <dep package="gnome-utils"/>
       <dep package="gucharmap"/>
       <dep package="nautilus"/>
+      <dep package="sushi"/>
       <dep package="yelp"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 456b342..439ad03 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -398,6 +398,16 @@
     </suggests>
   </tarball>
 
+  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librest">
     <branch/>
     <dependencies>