jhbuild r2359 - in trunk: . modulesets

[vuntz svn gnome org]

Author: vuntz
Date: Thu Sep 11 15:55:31 2008
New Revision: 2359
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2359&view=rev

Log:
2008-09-11  Vincent Untz  <vuntz gnome org>

	* modulesets/gnome-suites-2.24.modules:
	* modulesets/mobile-2.24.modules:
	Move some of the mobile stuff to gnome-suites-2.24.modules. We have a
	new meta-gnome-mobile-suite target that people can use.
	It's a required step to have an official release of the Mobile suite on
	ftp.gnome.org.


Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-suites-2.24.modules
   trunk/modulesets/mobile-2.24.modules

Modified: trunk/modulesets/gnome-suites-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.24.modules	(original)
+++ trunk/modulesets/gnome-suites-2.24.modules	Thu Sep 11 15:55:31 2008
@@ -1476,6 +1476,27 @@
     </dependencies>
   </autotools>
 
+<!-- Mobile -->
+
+  <repository type="svn" name="o-hand.com"
+    href="http://svn.o-hand.com/repos/"/>
+
+  <repository type="svn" name="imendio.com"
+    href="http://developer.imendio.com/svn/"/>
+
+  <autotools id="evolution-data-server-dbus" autogenargs="--with-libdb --with-dbus --enable-calendar --enable-nntp=no --without-libgnome --without-openldap --without-bug-buddy --without-soup --disable-groupwise --disable-smime --disable-nss">
+    <branch repo="o-hand.com" module="eds-dbus/trunk" checkoutdir="eds-dbus"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gconf-dbus">
+    <branch repo="imendio.com" module="gconf-dbus/trunk" checkoutdir="gconf-dbus"/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
 <!-- Proposed Modules -->
 
 <!-- Meta Modules -->
@@ -1668,6 +1689,21 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gnome-mobile-suite">
+    <dependencies>
+      <dep package="gconf-dbus"/>
+      <dep package="atk"/>
+      <dep package="evolution-data-server-dbus"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="gtk-doc"/>
+      <dep package="intltool"/>
+      <dep package="pango"/>
+    </dependencies>
+  </metamodule>
+
   <metamodule id="meta-gnome-desktop">
     <dependencies>
       <dep package="meta-gnome-devel-platform"/>

Modified: trunk/modulesets/mobile-2.24.modules
==============================================================================
--- trunk/modulesets/mobile-2.24.modules	(original)
+++ trunk/modulesets/mobile-2.24.modules	Thu Sep 11 15:55:31 2008
@@ -3,32 +3,14 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
-  <repository type="svn" name="o-hand.com"
-    href="http://svn.o-hand.com/repos/"/>
-
-  <repository type="svn" name="imendio.com"
-    href="http://developer.imendio.com/svn/"/>
-
   <include href="gnome-2.24.modules"/>
   <include href="matchbox.modules"/>
   <include href="pimlico.modules"/>
 
-  <!-- Override EDS to the DBus port -->
-  <autotools id="evolution-data-server" autogenargs="--with-libdb --with-dbus --enable-calendar --enable-nntp=no --without-libgnome --without-openldap --without-bug-buddy --without-soup --disable-groupwise --disable-smime --disable-nss">
-    <branch repo="o-hand.com" module="eds-dbus/trunk" checkoutdir="eds-dbus"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <!-- Override GConf to the DBus port -->
-  <autotools id="gconf">
-    <branch repo="imendio.com" module="gconf-dbus/trunk" checkoutdir="gconf-dbus"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  
+  <!-- When adding a new module here that is to be released on ftp.gnome.org,
+       please also talk to the release team to update meta-gnome-mobile-suite
+       in gnome-suites-2.x.modules. It's required to have the module in
+       http://download.gnome.org/mobile/ -->
   <metamodule id="meta-mobile-platform">
     <dependencies>
       <!-- Base layer -->
@@ -38,12 +20,12 @@
       <!-- GTK+ layer -->
       <dep package="gtk+"/>
       <!-- The rest -->
-      <dep package="gconf"/>
+      <dep package="gconf-dbus"/>
       <dep package="gst-plugins-base"/>
       <!-- gnome-vfs is deprecated, but you may want to enable it -->
       <!-- <dep package="gnome-vfs"/> -->
       <dep package="gvfs"/>
-      <dep package="evolution-data-server"/>
+      <dep package="evolution-data-server-dbus"/>
       <dep package="telepathy-mission-control"/>
       <dep package="avahi"/>
       <!--<dep package="bluez"/> -->