[jhbuild] [devel] various update to -devel modulesets

[Marc-Andre Lureau <malureau src gnome org>]

commit 9eb1b4a0845159fd611efe9f30ab192e1dcc79a2
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Mon Aug 2 15:47:44 2010 +0200

    [devel] various update to -devel modulesets

 modulesets/gnome-devel.modules               |  105 ++++++++++++++++++++++----
 modulesets/gnome-external-deps-devel.modules |   83 +++++++++++++++++++-
 modulesets/gnome-suites-devel.modules        |   16 +++-
 3 files changed, 181 insertions(+), 23 deletions(-)
---
diff --git a/modulesets/gnome-devel.modules b/modulesets/gnome-devel.modules
index bc1a025..eea511c 100644
--- a/modulesets/gnome-devel.modules
+++ b/modulesets/gnome-devel.modules
@@ -9,6 +9,10 @@
       href="git://git.kernel.org/pub/scm/"/>
   <repository type="git" name="git.clutter-project.org"
       href="git://git.clutter-project.org/"/>
+  <repository type="git" name="git.gupnp.org"
+      href="git://git.gupnp.org/"/>
+  <repository type="git" name="gitorious.org"
+      href="git://gitorious.org/"/>
 
   <repository type="cvs" name="cairo.freedesktop.org"
       cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
@@ -66,7 +70,6 @@
       <dep package="gst-python"/>
       <dep package="clutter"/>
       <dep package="clutter-gst"/>
-      <dep package="clutter-cairo"/>
       <dep package="clutter-gtk"/>
     </dependencies>
   </autotools>
@@ -153,34 +156,104 @@
     </dependencies>
   </autotools>
 
-  <autotools id="tracker">
+  <autotools id="libgee">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="gmime"/>
-      <dep package="dbus-glib"/>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libglade"/>
-      <dep package="poppler"/>
-      <dep package="libgsf"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp-dlna">
+    <branch repo="gitorious.org" module="gupnp/gupnp-dlna"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
       <dep package="gstreamer"/>
-      <dep package="sqlite3"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gssdp">
+    <branch repo="gitorious.org" module="gupnp/gssdp"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp">
+    <branch repo="gitorious.org" module="gupnp/gupnp"/>
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp-av">
+    <branch repo="gitorious.org" module="gupnp/gupnp-av"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp-tools">
+    <branch repo="gitorious.org" module="gupnp/gupnp-tools"/>
+    <dependencies>
+      <dep package="gupnp"/>
+      <dep package="gtk+"/>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp-ui">
+    <branch repo="gitorious.org" module="gupnp/gupnp-ui"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gupnp-vala">
+    <branch repo="gitorious.org" module="gupnp/gupnp-vala"/>
+    <dependencies>
       <dep package="vala"/>
-      <dep package="libgee"/>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-dlna"/>
     </dependencies>
     <suggests>
-      <dep package="exempi"/>
+      <dep package="gupnp-ui"/>
     </suggests>
+  </autotools>
+
+  <autotools id="mx">
+    <branch repo="git.clutter-project.org" module="mx"/>
+    <dependencies>
+      <dep package="clutter"/>
+    </dependencies>
     <after>
-      <dep package="deskbar-applet"/>
+      <dep package="startup-notification"/>
+      <dep package="dbus-glib"/>
+      <dep package="glade3"/>
+      <dep package="gtk+"/>
     </after>
   </autotools>
 
-  <autotools id="libgee">
+  <autotools id="gnome-video-effects">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="telepathy-vala">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-external-deps-devel.modules b/modulesets/gnome-external-deps-devel.modules
index 577259f..8df066b 100644
--- a/modulesets/gnome-external-deps-devel.modules
+++ b/modulesets/gnome-external-deps-devel.modules
@@ -56,6 +56,8 @@
       href="git://git.cairographics.org/git/" password=""/>
   <repository type="git" name="git.webkit.org"
       href="git://git.webkit.org/" password=""/>
+  <repository type="git" name="github.com"
+      href="git://github.com/" password=""/>
 
   <repository type="bzr" name="mega-nerd.com"
       href="http://www.mega-nerd.com/Bzr/"/>
@@ -402,7 +404,7 @@
   </autotools>
 
   <autotools id="libgdiplus">
-    <branch module="trunk/libgdiplus" repo="svn.mono-project.com"/>
+    <branch module="mono/libgdiplus" repo="github.com" checkoutdir="libgdiplus"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -411,14 +413,14 @@
   </autotools>
 
   <autotools id="mono">
-    <branch module="trunk/mono" repo="svn.mono-project.com"/>
+    <branch module="mono/mono" repo="github.com" checkoutdir="mono"/>
     <dependencies>
       <dep package="libgdiplus"/>
     </dependencies>
   </autotools>
 
   <autotools id="monodoc">
-    <branch module="trunk/monodoc" repo="svn.mono-project.com"/>
+    <branch module="mono/monodoc" repo="github.com" checkoutdir="monodoc"/>
     <dependencies>
       <dep package="mono"/>
     </dependencies>
@@ -449,13 +451,23 @@
     </dependencies>
   </autotools>
 
-  <autotools id="telepathy-glib">
+  <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings">
     <branch repo="git.collabora.co.uk"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="libxslt"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="telepathy-logger">
+    <branch repo="git.collabora.co.uk"/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
 
@@ -649,4 +661,67 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libpeas">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+    <suggests>
+      <dep package="pygobject"/>
+      <dep package="seed"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="libunique-3">
+    <branch module="unique"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="folks">
+    <branch/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libgee"/>
+      <dep package="vala"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-js-common">
+    <branch/>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="tracker">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gstreamer"/>
+      <dep package="hal"/>
+      <dep package="intltool"/>
+      <dep package="poppler"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="evolution"/>
+      <dep package="exempi"/>
+      <dep package="upower"/>
+      <dep package="libgsf"/>
+      <dep package="gdk-pixbuf"/>
+    </suggests>
+    <after>
+      <dep package="deskbar-applet"/>
+    </after>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-devel.modules b/modulesets/gnome-suites-devel.modules
index 583dc98..bbb5dd3 100644
--- a/modulesets/gnome-suites-devel.modules
+++ b/modulesets/gnome-suites-devel.modules
@@ -14,19 +14,24 @@
     <branch/>
   </autotools>
 
-  <autotools id="gtk+">
-    <branch/>
+  <autotools id="gtk+-3">
+    <branch checkoutdir="gtk+-3" module="gtk+"/>
     <dependencies>
+      <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="pango"/>
       <dep package="atk"/>
-      <dep package="shared-mime-info"/>
+      <dep package="gdk-pixbuf"/>
     </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
   <autotools id="gtkmm">
     <branch/>
     <dependencies>
+      <dep package="atkmm"/>
       <dep package="pangomm"/>
       <dep package="gtk+"/>
     </dependencies>
@@ -105,9 +110,13 @@
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
+      <dep package="clutter-gst" />
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
       <dep package="evolution-data-server"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gnome-video-effects"/>
+      <dep package="mx"/>
     </dependencies>
   </autotools>
 
@@ -145,6 +154,7 @@
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="libbonobo"/>
+      <dep package="libcanberra"/>
       <dep package="gnome-vfs"/>
       <dep package="gconf"/>
     </dependencies>