[jhbuild] [3.0] move brasero, empathy & evince back to core utilities

[Frederic Peters <fpeters src gnome org>]

commit 1ec918efacf673398dc33007847891c597c7f312
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Mar 29 14:09:25 2011 +0530

    [3.0] move brasero, empathy & evince back to core utilities

 modulesets/gnome-apps-3.0.modules        |   63 ------------------------------
 modulesets/gnome-suites-core-3.0.modules |   63 ++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 63 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index baedb3a..e7940bf 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -688,22 +688,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="brasero" autogenargs="--with-gtk=3.0">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libcanberra"/>
-      <dep package="libxml2"/>
-    </dependencies>
-    <suggests>
-      <dep package="libnotify"/>
-      <dep package="nautilus"/>
-      <dep package="totem-pl-parser"/>
-    </suggests>
-  </autotools>
-
   <autotools id="cheese">
     <branch/>
     <dependencies>
@@ -752,50 +736,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="empathy">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="telepathy-glib"/>
-      <dep package="folks"/>
-      <dep package="telepathy-logger"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="evolution-data-server"/>
-      <dep package="libcanberra"/>
-      <dep package="telepathy-farsight"/>
-      <dep package="gnome-keyring"/>
-      <dep package="libnotify"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="iso-codes"/>
-      <dep package="libchamplain"/>
-      <dep package="WebKit"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="evince" autogenargs="--with-gtk=3.0">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="gnome-icon-theme"/>
-      <dep package="poppler"/>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-    <suggests>
-      <dep package="libgnome-keyring"/>
-    </suggests>
-    <after>
-      <dep package="nautilus"/>
-    </after>
-  </autotools>
-
   <autotools id="evolution" autogenargs="--disable-image-inline --disable-pst-import --disable-nm">
     <branch revision="gnome-3-0"/>
     <dependencies>
@@ -1003,12 +943,9 @@
       <dep package="accerciser"/>
       <dep package="alacarte"/>
       <dep package="anjuta"/>
-      <dep package="brasero"/>
       <dep package="cheese"/>
       <dep package="devhelp"/>
       <dep package="ekiga"/>
-      <dep package="empathy"/>
-      <dep package="evince"/>
       <dep package="evolution"/>
       <dep package="file-roller"/>
       <dep package="gedit"/>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 1d30ea3..2f5c2e3 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -469,6 +469,47 @@
 
 <!-- Core Utilities -->
 
+  <autotools id="brasero">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libcanberra"/>
+      <dep package="libxml2"/>
+    </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+      <dep package="nautilus"/>
+      <dep package="totem-pl-parser"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="empathy">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="telepathy-glib"/>
+      <dep package="folks"/>
+      <dep package="telepathy-logger"/>
+      <dep package="telepathy-mission-control"/>
+      <dep package="evolution-data-server"/>
+      <dep package="libcanberra"/>
+      <dep package="telepathy-farsight"/>
+      <dep package="gnome-keyring"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="enchant"/>
+      <dep package="iso-codes"/>
+      <dep package="libchamplain"/>
+      <dep package="WebKit"/>
+    </suggests>
+  </autotools>
+
   <autotools id="eog">
     <branch/>
     <dependencies>
@@ -507,6 +548,25 @@
     </suggests>
   </autotools>
 
+  <autotools id="evince">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="gnome-icon-theme"/>
+      <dep package="poppler"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgnome-keyring"/>
+    </suggests>
+    <after>
+      <dep package="nautilus"/>
+    </after>
+  </autotools>
+
   <autotools id="gcalctool" supports-non-srcdir-builds="no" autogenargs="--with-gtk=3.0">
     <branch revision="gnome-3-0"/>
     <dependencies>
@@ -823,8 +883,11 @@
   -->
   <metamodule id="meta-gnome-core-utilities">
     <dependencies>
+      <dep package="brasero"/>
+      <dep package="empathy"/>
       <dep package="epiphany"/>
       <dep package="eog"/>
+      <dep package="evince"/>
       <dep package="gcalctool"/>
       <dep package="gnome-disk-utility"/>
       <dep package="gnome-system-monitor"/>