[gnome-modulesets/gnome-3-8: 1/2] resync with current 3.8 modulesets



commit 28eaabd3c70c7e16ab9a5ca69b71c1c0f1875713
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Oct 4 21:03:23 2012 +0100

    resync with current 3.8 modulesets

 gnome-apps.modules           |  377 +++++++++++++++++++-------------
 gnome-core-deps-base.modules |  165 +++++++--------
 gnome-core-deps.modules      |  441 +++++++++++++++++++++++++++----------
 gnome-core.modules           |  175 +++++++++------
 gnome-sysdeps.modules        |  359 ++++++++++++++++++++++++++++++
 gnome-world.modules          |  499 ++++++++++++++++++++++++++++++------------
 6 files changed, 1446 insertions(+), 570 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index f7ddea2..71ad371 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -23,29 +23,34 @@
       href="git://libvirt.org/"/>
   <repository type="git" name="fedorahosted.org"
       href="git://git.fedorahosted.org/git/"/>
-
+  <repository type="git" name="colord.gitorious.org"
+      href="git://gitorious.org/colord/"/>
+  <repository type="svn" name="opalvoip.sf.net"
+      href="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="cairo.org"
     href="http://cairographics.org/"/>
   <repository type="tarball" name="gnome.org"
     href="http://download.gnome.org/sources/"/>
-  <repository type="tarball" name="clutter-project.org"
-    href="http://source.clutter-project.org/sources/"/>
   <repository type="tarball" name="mono.net"
     href="http://download.mono-project.com/sources/"/>
   <repository type="tarball" name="launchpad.net/tarball"
       href="https://launchpad.net/"/>
   <repository type="tarball" name="monogithub"
     href="https://github.com/downloads/mono/dbus-sharp/"/>
+  <repository type="tarball" name="github.com/metabrainz"
+      href="https://github.com/downloads/metabrainz/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="libvirt.org"
-      href="http://libvirt.org/sources/stable_updates/"/>
+      href="http://libvirt.org/sources/"/>
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
   <repository type="tarball" name="xiph.org"
         href="http://downloads.xiph.org/releases/"/>
+  <repository type="tarball" name="ftp.gnu.org"
+      href="http://ftp.gnu.org/gnu/"/>
 
   <include href="gnome-core.modules"/>
 
@@ -68,14 +73,26 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libvirt"
-             autogenargs="--with-yajl">
+  <autotools id="colord-gtk">
+    <branch repo="colord.gitorious.org" checkoutdir="colord-gtk" module="colord-gtk.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="colord"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libvirt" autogenargs="--with-yajl">
     <branch repo="libvirt.org"
-            module="libvirt-0.9.11.3.tar.gz"
-            version="0.9.11.3"
-            hash="sha256:aa73b329d2f6eb200991b9dc378d4636c15cd2f95ca224995d01b45257584fa2"
-            size="19615688"/>
+            module="libvirt-0.10.2.tar.gz"
+            version="0.10.2"
+            hash="sha256:1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977">
+    </branch>
     <dependencies>
+      <dep package="device-mapper"/>
+      <dep package="libnl"/>
+      <dep package="yajl"/>
     </dependencies>
   </autotools>
 
@@ -126,6 +143,8 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -160,6 +179,16 @@
     </after>
   </autotools>
 
+  <autotools id="gnome-search-tool">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="goffice">
     <branch/>
     <dependencies>
@@ -173,6 +202,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good" revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="flac"/>
+      <dep package="libv4l"/>
+      <dep package="libvpx"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gtkhtml">
     <branch/>
     <dependencies>
@@ -202,7 +249,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
+  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala --disable-werror">
     <branch/>
     <dependencies>
       <dep package="cairo"/>
@@ -214,34 +261,21 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gssdp">
-    <branch />
+  <autotools id="guile">
+    <pkg-config>guile-2.0.pc</pkg-config>
+    <branch repo="ftp.gnu.org"
+            module="guile/guile-2.0.3.tar.xz"
+            version="2.0.3"
+            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
+            size="4196064"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
+      <dep package="libunistring"/>
+      <dep package="gc"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gupnp" autogenargs="--with-context-manager=network-manager">
-    <branch />
-    <dependencies>
-      <dep package="gssdp"/>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="shared-mime-info"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-      <dep package="NetworkManager"/>
-    </suggests>
   </autotools>
 
   <autotools id="gupnp-av">
-    <branch />
+    <branch revision="gupnp-av-0-10" />
     <dependencies>
       <dep package="glib"/>
       <dep package="gupnp"/>
@@ -278,11 +312,13 @@
     </suggests>
  </autotools>
 
-  <autotools id="libgda" autogenargs="--with-java=no">
+  <autotools id="libgda" autogenargs="--with-java=no --disable-tools">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
+      <dep package="openssl"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -299,12 +335,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libosinfo" autogenargs="--enable-tests=no">
+  <autotools id="libosinfo"
+             autogenargs="--enable-tests=no --enable-werror=no">
     <branch repo="fedorahosted.org" module="libosinfo.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="vala"/>
+      <dep package="wget"/>
     </dependencies>
   </autotools>
 
@@ -389,23 +427,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="opal" autogenargs="--disable-vpb"
-             check-target="false" supports-non-srcdir-builds="no">
-    <branch module="opal/3.10/opal-3.10.2.tar.xz" repo="gnome.org"
-            version="3.10.2"
-            hash="sha256:8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205"
-            size="7093124"/>
+  <autotools id="opal" autogenargs="--disable-vpb">
+    <branch repo="opalvoip.sf.net" module="opal/branches/v3_10"/>
     <dependencies>
       <dep package="ptlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ptlib" check-target="false" supports-non-srcdir-builds="no">
-    <branch module="ptlib/2.10/ptlib-2.10.2.tar.xz" repo="gnome.org"
-            autogen-sh="configure"
-            version="2.10.2"
-            hash="sha256:a0985848da2ea06a4df804a650fd800ff52a01f889c116595b9a67fc35537140"
-            size="2928224"/>
+  <autotools id="ptlib">
+    <branch repo="opalvoip.sf.net" module="ptlib/branches/v2_10"/>
   </autotools>
 
   <autotools id="pyatspi2">
@@ -430,16 +460,6 @@
     </dependencies>
   </autotools>
 
-  <repository type="tarball" name="pyxdg"
-      href="http://people.freedesktop.org/~lanius/"/>
-  <distutils id="pyxdg">
-    <branch repo="pyxdg"
-            module="pyxdg-0.19.tar.gz"
-            version="0.19"
-            hash="sha256:99cf27e00f1484eeeea31aa47de52644284dca34adf73b715e87fb0a3b8d4ad5"
-            size="38170"/>
-  </distutils>
-
   <autotools id="spice-protocol">
     <branch repo="spice"
             module="releases/spice-protocol-0.10.1.tar.bz2"
@@ -464,12 +484,14 @@
 
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala">
     <branch repo="spice"
-            module="gtk/spice-gtk-0.11.tar.bz2"
-            version="0.11"
-            hash="sha256:7639876b49efc8bbe5e0668fdbadcd768acc9bbd5235b4856ae632235e784eba"
-            size="868491"/>
+            module="gtk/spice-gtk-0.14.tar.bz2"
+            version="0.14"
+            hash="sha256:a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5"
+            size="1204821">
+    </branch>
     <dependencies>
       <dep package="celt"/>
+      <dep package="cyrus-sasl"/>
       <dep package="spice-protocol"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
@@ -520,6 +542,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libzapojit">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="json-glib"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="gnome-online-accounts"/>
+    </dependencies>
+  </autotools>
+
   <!-- Apps start here -->
 
   <autotools id="abiword">
@@ -546,7 +579,7 @@
       <dep package="intltool"/>
       <dep package="pygobject"/>
       <dep package="pyatspi2"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
@@ -571,7 +604,7 @@
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="deja-dup/24"
+            module="deja-dup/26"
             checkoutdir="deja-dup/"/>
     <dependencies>
       <dep package="duplicity"/>
@@ -624,6 +657,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="gettext"/>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="libxml2"/>
+      <dep package="intltool"/>
+      <dep package="rarian"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-documents">
     <branch/>
     <dependencies>
@@ -638,6 +683,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="libgdata"/>
       <dep package="liboauth"/>
+      <dep package="libzapojit"/>
     </dependencies>
   </autotools>
 
@@ -655,16 +701,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-scan">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="gconf"/>
-      <dep package="gegl"/>
-      <dep package="gimp"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-tweak-tool">
     <branch/>
     <dependencies>
@@ -699,18 +735,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-bad-0.10"
-             autogenargs="--disable-tests --disable-fatal-warnings"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-bad"
-            checkoutdir="gst-plugins-bad-0.10"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="inkscape">
     <branch repo="launchpad.net"
             module="inkscape"
@@ -730,17 +754,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="monkey-bubble">
-    <branch/>
-    <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="libxml2"/>
-      <dep package="gconf"/>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="devhelp">
     <branch/>
     <dependencies>
@@ -756,25 +769,27 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gtk-doc" />
       <dep package="gtk+"/>
       <dep package="libxml2"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-color-manager">
     <branch/>
     <dependencies>
+      <dep package="exiv2"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
       <dep package="lcms2"/>
       <dep package="libcanberra"/>
+      <dep package="libexif"/>
       <dep package="vte"/>
-      <dep package="colord"/>
+      <dep package="colord-gtk"/>
+      <dep package="yelp-tools"/>
       <!-- and libtiff -->
     </dependencies>
     <suggests>
@@ -789,8 +804,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="rarian" supports-non-srcdir-builds="no">
+    <!-- Always build rarian due to some distributions providing rarian-compat
+                  package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
+         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
+    <!-- <pkg-config>rarian.pc</pkg-config> -->
+    <branch repo="gnome.org"
+            module="rarian/0.8/rarian-0.8.1.tar.bz2"
+            version="0.8.1"
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            size="324441"/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="rygel">
-    <branch/>
+    <branch revision="rygel-0-16"/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp-vala"/>
@@ -799,6 +830,8 @@
       <dep package="gupnp-dlna"/>
       <dep package="gstreamer-0.10"/>
       <dep package="libgee-0.6"/>
+      <dep package="tracker"/>
+      <dep package="valadoc"/>
     </dependencies>
   </autotools>
 
@@ -832,43 +865,27 @@
       <dep package="gdl"/>
       <dep package="libgda"/>
       <dep package="gtksourceview"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
       <dep package="devhelp"/>
       <dep package="vala"/>
-      <dep package="autogen"/>
     </suggests>
   </autotools>
 
- <autotools id="mx">
-    <branch repo="clutter-project.org"
-            module="mx/1.4/mx-1.4.3.tar.xz"
-            version="1.4.3"
-            hash="sha256:d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5"
-            size="951232"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="startup-notification"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-
   <autotools id="cheese">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gst-plugins-good-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
       <dep package="gudev"/>
-      <dep package="clutter-gst" />
+      <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
       <dep package="vala"/>
@@ -876,13 +893,7 @@
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
-      <dep package="mx"/>
     </dependencies>
-    <suggests>
-      <!-- this is not an approved dependency, it is left as a suggest so a
-           moduleset defining this module would get it working -->
-      <dep package="mx"/>
-    </suggests>
   </autotools>
 
   <autotools id="ekiga">
@@ -893,6 +904,7 @@
       <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="libsigc++2"/>
+      <dep package="libXv"/>
       <dep package="opal" />
       <dep package="evolution-data-server"/>
     </dependencies>
@@ -906,16 +918,14 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-pst-import --disable-weather">
+  <autotools id="evolution" autogenargs="--disable-pst-import">
     <branch/>
     <dependencies>
       <dep package="evolution-data-server"/>
-      <dep package="gconf"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="gtkhtml"/>
       <dep package="intltool"/>
@@ -927,10 +937,11 @@
       <dep package="libxml2"/>
       <dep package="libnotify"/>
       <dep package="shared-mime-info"/>
-      <dep package="WebKit"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="geoclue"/>
+      <dep package="geocode-glib"/>
     </suggests>
     <after>
       <dep package="mono"/>
@@ -940,11 +951,12 @@
   <autotools id="file-roller">
     <branch/>
     <dependencies>
+      <dep package="file"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="nautilus"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -980,11 +992,33 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-initial-setup">
+    <branch/>
+    <dependencies>
+      <dep package="accountsservice"/>
+      <dep package="cheese"/>
+      <dep package="clutter-gtk"/>
+      <dep package="geoclue"/>
+      <dep package="gdm"/>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="libgweather"/>
+      <dep package="NetworkManager"/>
+    </dependencies>
+    <suggest>
+      <dep package="libxklavier"/>
+      <dep package="upower"/>
+    </suggest>
+  </autotools>
+
   <autotools id="gnome-games">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="glu"/>
       <dep package="gtk+"/>
       <dep package="pygobject"/>
       <dep package="clutter"/>
@@ -1003,6 +1037,7 @@
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
       <dep package="gconf"/>
+      <dep package="guile"/>
     </dependencies>
   </autotools>
 
@@ -1011,7 +1046,7 @@
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gconf"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -1032,7 +1067,7 @@
   </autotools>
 
   <autotools id="grilo">
-    <branch/>
+    <branch revision="0.2.x"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1045,7 +1080,7 @@
   </autotools>
 
   <autotools id="grilo-plugins">
-    <branch/>
+    <branch revision="0.2.x"/>
     <dependencies>
       <dep package="grilo"/>
       <dep package="libxml2"/>
@@ -1062,13 +1097,27 @@
     </suggests>
   </autotools>
 
+  <cmake id="libmusicbrainz4"
+         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
+    <pkg-config>libmusicbrainz4.pc</pkg-config>
+    <branch repo="github.com/metabrainz"
+            module="libmusicbrainz/libmusicbrainz-4.0.3.tar.gz"
+            version="4.0.3"
+            hash="sha256:8f2a8f6e8aa858a66860a4726ee383480b43a57350b28a4478af3e19cacb52d7"
+            size="110111">
+    </branch>
+    <dependencies>
+    </dependencies>
+  </cmake>
+
   <autotools id="nautilus-sendto">
-    <branch revision="gnome-3-0"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="evolution-data-server"/>
+      <dep package="nautilus"/>
     </dependencies>
     <suggests>
       <dep package="gupnp-av"/>
@@ -1078,6 +1127,7 @@
   <autotools id="nemiver">
     <branch/>
     <dependencies>
+      <dep package="boost"/>
       <dep package="gdlmm"/>
       <dep package="gtkmm"/>
       <dep package="glibmm"/>
@@ -1086,7 +1136,7 @@
       <dep package="libgtop"/>
       <dep package="libxml2"/>
       <dep package="ghex"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -1095,36 +1145,38 @@
     <dependencies>
       <dep package="gtk+"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
-      <dep package="gnome-doc-utils"/>
       <dep package="intltool"/>
       <dep package="pyatspi2"/>
       <dep package="py2cairo"/>
       <dep package="pygobject"/>
-      <dep package="pyxdg"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="rhythmbox">
     <branch/>
     <dependencies>
+      <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="grilo"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="gtk+"/>
       <dep package="gudev"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="libgnome-media-profiles"/>
-      <dep package="totem-pl-parser"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="pygobject"/>
+      <dep package="json-glib"/>
+      <dep package="libnotify"/>
       <dep package="libpeas"/>
       <dep package="libsoup"/>
-      <dep package="libnotify"/>
+      <dep package="libxml2"/>
+      <dep package="pygobject"/>
+      <dep package="totem-pl-parser"/>
     </dependencies>
     <suggests>
-      <dep package="libgnome-keyring"/>
       <dep package="avahi"/>
-      <dep package="libmusicbrainz"/>
       <dep package="brasero"/>
       <dep package="libdmapsharing"/>
+      <dep package="libgnome-keyring"/>
       <dep package="vala"/>
       <dep package="WebKit"/>
     </suggests>
@@ -1137,7 +1189,9 @@
       <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="libsoup"/>
-      <dep package="libgnome-keyring"/>
+      <dep package="libsecret"/>
+      <dep package="gcr"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="avahi"/>
@@ -1145,6 +1199,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="libunique">
+    <pkg-config>unique-3.0.pc</pkg-config>
+    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
+            version="3.0.2" checkoutdir="libunique-3.0.2"
+            hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
+            size="342778"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="shotwell">
     <branch repo="yorba.org" module="shotwell"/>
     <dependencies>
@@ -1170,10 +1236,9 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gst-plugins-good-0.10"/>
-      <dep package="libgnome-media-profiles"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
       <dep package="brasero"/>
       <dep package="libmusicbrainz"/>
       <dep package="libcanberra"/>
@@ -1235,13 +1300,13 @@
       <dep package="gnome-documents"/>
       <dep package="gnome-devel-docs"/>
       <dep package="gnome-games"/>
+      <dep package="gnome-initial-setup"/>
       <dep package="gnome-nettool"/>
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
       <dep package="orca"/>
       <dep package="rygel"/>
       <dep package="seahorse"/>
-      <dep package="totem"/>
       <dep package="vinagre"/>
     </dependencies>
   </metamodule>
diff --git a/gnome-core-deps-base.modules b/gnome-core-deps-base.modules
index d97d360..5fe1f68 100644
--- a/gnome-core-deps-base.modules
+++ b/gnome-core-deps-base.modules
@@ -27,16 +27,14 @@
     href="http://libproxy.googlecode.com/files/"/>
 <repository type="tarball" name="0pointer.de"
     href="http://0pointer.de/lennart/projects/"/>
-<repository type="tarball" name="ftp.musicbrainz.org"
-    href="http://ftp.musicbrainz.org/pub/musicbrainz/"/>
+<repository type="tarball" name="github.com/metabrainz"
+    href="https://github.com/downloads/metabrainz/"/>
 <repository type="tarball" name="libnl"
     href="http://www.infradead.org/~tgr/libnl/files/"/>
 <repository type="tarball" name="kernel.org"
     href="http://www.kernel.org/pub/linux/"/>
 <repository type="tarball" name="dbus"
     href="http://dbus.freedesktop.org/releases/"/>
-<repository type="tarball" name="nice"
-    href="http://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="cairo.org"
     href="http://cairographics.org/"/>
 <repository type="tarball" name="people.freedesktop.org"
@@ -45,8 +43,10 @@
     href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="json"
     href="http://oss.metaparadigm.com/json-c/"/>
-<repository type="tarball" name="libffi"
-    href="ftp://sourceware.org/pub/libffi"/>
+<repository type="tarball" name="complang.org"
+    href="http://www.complang.org/"/>
+
+  <include href="gnome-sysdeps.modules"/>
 
 <!-- Please try to keep organized alphabetically -->
 
@@ -62,9 +62,6 @@
       <dep package="gtk-doc"/>
       <dep package="pixman"/>
     </dependencies>
-    <after>
-      <dep package="glitz"/>
-    </after>
   </autotools>
 
   <autotools id="cairomm" autogen-sh="configure">
@@ -88,8 +85,8 @@
     </branch>
     <dependencies>
       <dep package="dbus"/>
-      <dep package="expat"/>
       <dep package="glib"/>
+      <dep package="expat"/>
     </dependencies>
   </autotools>
 
@@ -146,6 +143,7 @@
   </tarball>
 
   <autotools id="gnutls" version="2.12.8" autogenargs="--enable-guile=no --with-libgcrypt">
+    <pkg-config>gnutls.pc</pkg-config>
     <branch module="gnutls/gnutls-2.12.8.tar.bz2" version="2.12.8"
             repo="ftp.gnu.org"
             hash="sha256:c1bcb3c90a76e0c4c5c953ec1fb4e5e318e59afefc24fbec21c1741bf652b262"
@@ -167,7 +165,7 @@
   <repository type="tarball" name="fedoraproject.org"
     href="pkgs.fedoraproject.org/repo/pkgs/"/>
   <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no"
-             autogen-sh="autogen.sh">
+             autogen-sh="autogen.sh" autogenargs="--with-rootlibdir=${libdir}">
     <pkg-config>gudev-1.0.pc</pkg-config>
     <branch repo="fedoraproject.org"
             module="udev/udev-173.tar.bz2/91a88a359b60bbd074b024883cc0dbde/udev-173.tar.bz2"
@@ -177,7 +175,9 @@
       <patch file="gudev-173.patch" strip="1"/>
     </branch>
     <dependencies>
+      <dep package="gperf"/>
       <dep package="gobject-introspection"/>
+      <dep package="libacl"/>
     </dependencies>
   </autotools>
 
@@ -250,19 +250,20 @@
   <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
     <pkg-config>libcanberra-gtk.pc</pkg-config>
     <branch repo="0pointer.de"
-            module="libcanberra/libcanberra-0.28.tar.gz"
-            version="0.28"
-            hash="sha256:eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c"
-            size="487276">
+            module="libcanberra/libcanberra-0.29.tar.xz"
+            version="0.29"
+            hash="sha256:127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
+            size="315728">
     </branch>
     <dependencies>
       <dep package="gtk-doc"/>
+      <dep package="libvorbis"/>
     </dependencies>
     <after>
       <dep package="gtk+"/>
       <dep package="gtk+-2"/>
       <dep package="pulseaudio"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
     </after>
   </autotools>
 
@@ -274,13 +275,15 @@
             size="340474"/>
   </autotools>
 
-  <autotools id="libffi">
-    <pkg-config>libffi.pc</pkg-config>
-    <branch repo="libffi"
-            module="libffi-3.0.9.tar.gz"
-            version="3.0.9"
-            hash="sha256:589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
-            size="731719"/>
+  <autotools id="libexif">
+    <pkg-config>libexif.pc</pkg-config>
+    <branch repo="sourceforge.net"
+            module="libexif/libexif/0.6.21/libexif-0.6.21.tar.bz2"
+            version="0.6.21"
+            hash="sha256:16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a">
+    </branch>
+    <dependencies>
+    </dependencies>
   </autotools>
 
   <autotools id="libgpg-error" autogen-sh="configure" check-target="false">
@@ -291,16 +294,28 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" check-target="false">
-    <branch module="libgcrypt/libgcrypt-1.5.0.tar.bz2"
-            repo="gnupg.org"
+    <branch repo="gnupg.org"
+            module="libgcrypt/libgcrypt-1.5.0.tar.bz2"
             version="1.5.0"
             hash="sha256:4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa"
-            size="1433506"/>
+            size="1433506">
+    </branch>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
   </autotools>
 
+  <autotools id="libgphoto2"
+             autogen-sh="configure">
+    <pkg-config>libgphoto2.pc</pkg-config>
+    <branch repo="sourceforge.net"
+            module="gphoto/libgphoto/2.5.0/libgphoto2-2.5.0.tar.bz2"
+            version="2.5.0"
+            hash="sha256:e7df389f1b034be021066227c0908b8f21d3be0cd0c6ed56979c04c3a9f75b31"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
   <autotools id="libical" version="0.43" autogen-sh="configure">
     <pkg-config>libical.pc</pkg-config>
     <branch repo="sourceforge.net"
@@ -312,47 +327,22 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libmusicbrainz">
-    <pkg-config>libmusicbrainz4.pc</pkg-config>
-    <branch repo="ftp.musicbrainz.org"
-            module="libmusicbrainz-4.0.0.tar.gz"
-            version="4.0.0"
-            hash="sha256:30b139f51ee8c5bbe8803bdd6b24747276825f3cff7648ac72fba3c9d8f2e94a"
-            size="126597">
+  <cmake id="libmusicbrainz"
+         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
+    <pkg-config>libmusicbrainz5.pc</pkg-config>
+    <branch repo="github.com/metabrainz"
+            module="libmusicbrainz/libmusicbrainz-5.0.1.tar.gz"
+            version="5.0.1"
+            hash="sha256:1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5"
+            size="109119">
     </branch>
     <dependencies>
+      <dep package="neon"/>
     </dependencies>
   </cmake>
 
-  <autotools id="libnice"
-             autogenargs="--enable-gupnp">
-    <pkg-config>nice.pc</pkg-config>
-    <branch repo="nice"
-            module="libnice-0.1.2.tar.gz"
-            version="0.1.2"
-            hash="sha256:f2472b6392a27287ded21a6ba535b19c6204614fb191e1c4ff98295202c247f6"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gupnp-igd"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gupnp-igd"
-             autogenargs="--disable-python">
-     <pkg-config>gupnp-igd-1.0.pc</pkg-config>
-     <branch repo="gnome.org"
-             module="gupnp-igd/0.2/gupnp-igd-0.2.0.tar.xz"
-             version="0.2.0"
-             hash="sha256:924c17c511f18d021329f0d9515235069f4aa1632a487edebb21443002409952"/>
-     <dependencies>
-       <dep package="glib"/>
-       <dep package="gupnp"/>
-     </dependencies>
-  </autotools>
-
   <autotools id="libnl" skip-autogen="never" autogen-sh="configure" check-target="false">
-    <pkg-config>libnl-3.pc</pkg-config>
+    <pkg-config>libnl-3.0.pc</pkg-config>
     <branch repo="libnl"
             module="libnl-3.2.7.tar.gz"
             version="3.2.7"
@@ -382,12 +372,16 @@
   </autotools>
 
   <cmake id="libproxy"
-         cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_GNOME=OFF -DWITH_GNOME3=ON -DWITH_KDE4=OFF 
-DWITH_PYTHON=OFF -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DWITH_MOZJS=OFF -DWITH_WEBKIT=ON 
-DGAC_DIR=${prefix}/lib/mono">
+         cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_GNOME=OFF -DWITH_GNOME3=ON -DWITH_KDE4=OFF 
-DWITH_PYTHON=OFF -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DWITH_MOZJS=OFF -DWITH_WEBKIT3=ON 
-DGAC_DIR=${prefix}/lib/mono">
     <pkg-config>libproxy-1.0.pc</pkg-config>
     <branch repo="libproxy.googlecode.com"
             module="libproxy-0.4.7.tar.gz" version="0.4.7"
             hash="sha256:8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797"
-            size="91092"/>
+            size="91092">
+      <!-- fix gcc4.7 problems. Remove when new release. Patch rev 833:
+           http://code.google.com/p/libproxy/source/detail?r=833       -->
+      <patch file="libproxy-0.4.7-gcc47.patch"/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -418,12 +412,13 @@
 
   <autotools id="libxml2">
     <pkg-config>libxml-2.0.pc</pkg-config>
-    <branch module="libxml2/libxml2-2.7.8.tar.gz"
-            repo="xmlsoft.org" version="2.7.8"
-            hash="sha256:cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
-            size="4881808">
-      <patch file="libxml2-2.7.8-versioning.patch" strip="1"/>
-    </branch>
+    <branch module="libxml2/libxml2-2.8.0.tar.gz"
+            repo="xmlsoft.org" version="2.8.0"
+            hash="sha256:f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a"
+            size="4915203"/>
+    <dependencies>
+      <dep package="zlib"/>
+    </dependencies>
   </autotools>
 
   <autotools id="libxslt" check-target="false">
@@ -458,20 +453,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="rarian" supports-non-srcdir-builds="no">
-    <!-- Always build rarian due to some distributions providing rarian-compat
-         package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
-         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
-    <!-- <pkg-config>rarian.pc</pkg-config> -->
-    <branch repo="gnome.org"
-            module="rarian/0.8/rarian-0.8.1.tar.bz2"
-            version="0.8.1"
-            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
-            size="324441"/>
-    <dependencies>
-      <dep package="libxslt"/>
-      <dep package="intltool"/>
-    </dependencies>
+  <autotools id="ragel">
+    <branch repo="complang.org"
+            module="ragel/ragel-6.7.tar.gz"
+            version="6.7"
+            hash="sha256:46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30"
+            size="1182734">
+      <patch file="ragel-6.6-gcc47-lookup.patch" strip="1" />
+    </branch>
   </autotools>
 
   <!-- parallel builds broken due to: https://bugs.freedesktop.org/show_bug.cgi?id=46093 -->
@@ -489,12 +478,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="sound-theme-freedesktop" version="0.7">
+  <autotools id="sound-theme-freedesktop" version="0.8">
     <branch repo="people.freedesktop.org"
-            module="~mccann/dist/sound-theme-freedesktop-0.7.tar.bz2"
-            version="0.7"
-            hash="sha256:e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef"
-            size="483786"/>
+            module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
+            version="0.8"
+            hash="sha256:cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
+            size="478237"/>
   </autotools>
 
   <tarball id="speex" version="1.2rc1">
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index b71db06..f6dfd4c 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -35,18 +35,34 @@
     href="http://webkitgtk.org/releases/"/>
 <repository type="tarball" name="freedesktop.org"
     href="http://freedesktop.org/software/"/>
+<repository type="tarball" name="nice.freedesktop.org"
+    href="http://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="poppler.freedesktop.org"
     href="http://poppler.freedesktop.org/"/>
 <repository type="tarball" name="p11-glue.freedesktop.org"
     href="http://p11-glue.freedesktop.org/releases/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
+<repository type="tarball" name="libpwquality"
+    href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
+<repository type="tarball" name="graphviz.org"
+    href="http://www.graphviz.org/pub/"/>
+<repository type="tarball" name="launchpad.net/tarball"
+    href="https://launchpad.net/"/>
+<repository type="tarball" name="opencc"
+    href="http://opencc.googlecode.com/files/"/>
+<repository type="tarball" name="anthy"
+    href="http://ftp.jaist.ac.jp/pub/sourceforge.jp/anthy/37536/"/>
+<repository type="tarball" name="libhangul"
+    href="http://libhangul.googlecode.com/files/"/>
+<repository type="tarball" name="ibus"
+    href="http://ibus.googlecode.com/files/"/>
 
 <include href="gnome-core-deps-base.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
-<!-- Build dependencies of gnome-core -->
+<!-- Build dependencies of gnome-suites-core-3.4 -->
 
   <autotools id="gypsy">
     <branch repo="git.freedesktop.org"/>
@@ -63,9 +79,11 @@
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="glib"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="NetworkManager"/>
+      <dep package="libsoup"/>
     </dependencies>
     <suggests>
       <dep package="gypsy"/>
@@ -100,70 +118,57 @@
     <branch/>
   </autotools>
 
-  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="libxslt"/>
-      <dep package="libxml2"/>
-      <dep package="intltool"/>
-      <dep package="rarian"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-doc">
     <branch/>
     <dependencies>
       <dep package="libxslt"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  
-
   <autotools id="libgdata">
     <pkg-config>libgdata.pc</pkg-config>
     <branch/>
     <dependencies>
+      <dep package="gcr"/>
       <dep package="glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gobject-introspection"/>
       <dep package="libxml2"/>
       <dep package="libsoup"/>
       <dep package="liboauth"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
-<!-- OS Core API/ABI stable dependencies -->
-
-  <autotools id="atk">
-    <branch/>
+  <autotools id="libzeitgeist">
+    <branch repo="launchpad.net/tarball"
+            module="libzeitgeist/0.3/0.3.18/+download/libzeitgeist-0.3.18.tar.gz"
+            version="0.3.18"
+            hash="sha256:82c128d97a68600518b8e3e65ef4d5b123c57f3d5dfa977c7ff733c0fdf80f73"
+            size="527117"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cogl">
-    <pkg-config>cogl-2.0.pc</pkg-config>
+<!-- OS Core API/ABI stable dependencies -->
+
+  <autotools id="atk">
     <branch/>
     <dependencies>
       <dep package="glib"/>
-    </dependencies>
-    <suggests>
       <dep package="gobject-introspection"/>
-    </suggests>
+      <dep package="gtk-doc"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="cogl-1.10">
+  <autotools id="cogl">
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch module="cogl"
-            revision="cogl-1.10"
-            checkoutdir="cogl-1.10"/>
+    <branch revision="cogl-1.10"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="libXcomposite"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
@@ -173,7 +178,7 @@
   <autotools id="clutter">
     <branch/>
     <dependencies>
-      <dep package="cogl-1.10"/>
+      <dep package="cogl"/>
       <dep package="atk"/>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -194,6 +199,9 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="libtiff"/>
     </dependencies>
   </autotools>
 
@@ -211,7 +219,6 @@
            extension points -->
       <dep package="gvfs"/>
       <dep package="glib-networking"/>
-      <dep package="dconf"/>
     </suggests>
   </autotools>
 
@@ -237,6 +244,7 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
+      <dep package="at-spi2-atk"/>
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
@@ -250,10 +258,9 @@
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-    </dependencies>
-    <after>
+      <dep package="harfbuzz"/>
       <dep package="libXft"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <!-- OS Core unstable dependencies -->
@@ -289,26 +296,25 @@
     <branch/>
     <dependencies>
       <dep package="clutter"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
     </suggests>
   </autotools>
 
-  <autotools id="farstream"
-             autogenargs="--disable-python --disable-Werror">
+  <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
-            module="farstream/releases/farstream/farstream-0.1.1.tar.gz"
-            version="0.1.1"
-            hash="sha256:7b88a0730fbdd03297295574a613409790bf751d578690d7072cbf2be3f9ad52"/>
+            module="farstream/releases/farstream/farstream-${version}.tar.gz"
+            version="0.1.91"
+            hash="sha256:8aa148759f7ee771ba03168d0a9e0ef67b9f7b9d0faec07a551baaa10d441e35"/>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
   </autotools>
 
-  <autotools id="telepathy-farstream" autogenargs="--disable-python">
+  <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -316,7 +322,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="folks" autogenargs="--enable-eds-backend">
+  <autotools id="exempi" autogenargs="--enable-unittest=no">
+    <pkg-config>exempi-2.0.pc</pkg-config>
+    <branch repo="git.freedesktop.org"/>
+  </autotools>
+
+  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
     <branch/>
     <dependencies>
       <dep package="dbus"/>
@@ -326,6 +337,8 @@
       <dep package="gobject-introspection"/>
       <dep package="telepathy-glib"/>
       <dep package="evolution-data-server"/>
+      <dep package="libzeitgeist"/>
+      <dep package="shared-mime-info"/>
     </dependencies>
     <suggests>
       <dep package="telepathy-logger"/>
@@ -353,6 +366,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="harfbuzz" autogenargs="">
+    <branch repo="freedesktop.org"
+            module="harfbuzz/release/harfbuzz-0.9.3.tar.bz2"
+            version="0.9.3"
+            hash="sha256:02fbe8375dbbc7240cbb9183695359843a6c9fa52f6d0a6534edefc383f5b04d"
+            size="717318">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="ragel"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librest">
     <branch/>
     <dependencies>
@@ -362,19 +388,32 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libsecret">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgcrypt"/>
+    </suggests>
+  </autotools>
+
+
   <autotools id="gnome-video-effects">
     <branch/>
     <dependencies>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
     </dependencies>
   </autotools>
 
   <autotools id="gobject-introspection">
     <branch/>
     <dependencies>
+      <dep package="bison"/>
+      <dep package="flex"/>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="libffi"/>
+      <dep package="python-devel"/>
     </dependencies>
   </autotools>
 
@@ -393,6 +432,8 @@
       <dep package="gobject-introspection"/>
       <dep package="WebKit"/>
       <dep package="gnome-js-common"/>
+      <dep package="mpfr"/>
+      <dep package="readline"/>
     </dependencies>
   </autotools>
 
@@ -408,10 +449,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gstreamer-0.10" autogenargs="-- --disable-tests" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
+  <autotools id="gstreamer"
+             autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            revision="0.10"/>
+            checkoutdir="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -419,12 +462,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-base-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+  <autotools id="gst-plugins-base"
+             autogenargs="--with-gtk=3.0 --disable-gnome_vfs"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
-            revision="0.10"/>
+            checkoutdir="gst-plugins-base"/>
     <dependencies>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
@@ -433,13 +478,20 @@
     </suggests>
   </autotools>
 
-  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+  <autotools id="gst-plugins-good"
+             autogenargs="--with-gtk=3.0"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
-            revision="0.10"/>
+            checkoutdir="gst-plugins-good"/>
     <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="flac"/>
+      <dep package="libv4l"/>
+      <dep package="libvpx"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
     </dependencies>
     <suggests>
       <dep package="pulseaudio"/>
@@ -448,8 +500,20 @@
     </suggests>
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="-- --disable-tests" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
+  <autotools id="gst-plugins-bad"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-bad"
+            module="gst-plugins-bad"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="soundtouch"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gstreamer-0.10" autogenargs="-- --disable-tests" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gstreamer" revision="0.10" 
checkoutdir="gstreamer-0.10"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -457,10 +521,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-base" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
+  <autotools id="gst-plugins-base-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base" revision="0.10" 
checkoutdir="gst-plugins-base-0.10"/>
     <dependencies>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
@@ -469,19 +533,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gst-plugins-good" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="pulseaudio"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
-    </suggests>
-  </autotools>
-
   <autotools id="mm-common">
     <branch/>
   </autotools>
@@ -529,6 +580,41 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gssdp">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp"
+             autogenargs="--with-context-manager=network-manager">
+    <branch revision="gupnp-0.18"/>
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+      <dep package="NetworkManager"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp-igd"
+             autogenargs="--disable-python">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </autotools>
 
   <autotools id="itstool">
     <branch repo="itstool.org"
@@ -550,7 +636,6 @@
       <dep package="gtksourceview"/>
       <dep package="librsvg"/>
       <dep package="enchant"/>
-      <dep package="libunique"/>
       <dep package="libnotify"/>
     </dependencies>
   </autotools>
@@ -583,10 +668,10 @@
   <autotools id="libcroco" supports-non-srcdir-builds="no">
     <pkg-config>libcroco-0.6.pc</pkg-config>
     <branch repo="gnome.org"
-            module="libcroco/0.6/libcroco-0.6.5.tar.xz"
-            version="0.6.5"
-            hash="sha256:2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3"
-            size="462120"/>
+            module="libcroco/0.6/libcroco-0.6.6.tar.xz"
+            version="0.6.6"
+            hash="sha256:72ecace2f3d016a25f2b923c6d0cc76cced823e94171692c533f6c2088086bd9"
+            size="463920"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -594,9 +679,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgee">
-    <branch/>
-    <pkg-config>gee-0.8.pc</pkg-config>
+  <autotools id="libgee-0.6">
+    <pkg-config>gee-1.0.pc</pkg-config>
+    <branch module="libgee"
+            revision="0.6"
+            checkoutdir="libgee-0.6"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -604,11 +691,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgee-0.6">
-    <branch checkoutdir="libgee-0.6"
-            module="libgee"
-            revision="0.6"/>
-    <pkg-config>gee-1.0.pc</pkg-config>
+  <autotools id="libgee">
+    <pkg-config>gee-0.8.pc</pkg-config>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -664,6 +749,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libnice"
+             autogenargs="--enable-gupnp">
+    <pkg-config>nice.pc</pkg-config>
+    <branch repo="nice.freedesktop.org"
+            module="libnice-0.1.3.tar.gz"
+            version="0.1.3"
+            hash="sha256:046ce11f66638b54f2e042e7b1fbcc537ec99c27185fb006edbfd80d7f990074"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gupnp-igd"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libnotify">
     <branch/>
     <dependencies>
@@ -715,22 +814,10 @@
 
   <autotools id="p11-kit" supports-non-srcdir-builds="no">
     <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.8.tar.gz"
-            version="0.8"
-            hash="sha256:45eeaa8b397280a9536967c7a04c0353b0a0eff822ae53e6449288ca91d911bf"
-            size="528732" />
-  </autotools>
-
-  <autotools id="libunique">
-    <pkg-config>unique-3.0.pc</pkg-config>
-    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
-            version="3.0.2" checkoutdir="libunique-3.0.2"
-            hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
-            size="342778"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
+            module="p11-kit-0.13.tar.gz"
+            version="0.13"
+            hash="sha256:3cb942465efd5bde1c1875826118fe4bca45b0c9edc7c87835909a5866bed325"
+            size="544632" />
   </autotools>
 
   <autotools id="libxklavier" supports-non-srcdir-builds="no">
@@ -814,16 +901,15 @@
   <autotools id="poppler" autogenargs="--enable-xpdf-headers" makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
     <pkg-config>poppler-glib.pc</pkg-config>
     <branch repo="poppler.freedesktop.org"
-            module="poppler-0.18.4.tar.gz"
-            version="0.18.4"
-            hash="sha256:33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e"
-            size="1992993"/>
+            module="poppler-0.20.0.tar.gz"
+            version="0.20.0"
+            hash="sha256:b2e3253c2f4af248a2ffaac29161de6e462c587031e7875287b9956b45a0570d"
+            size="2140152"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
     <suggests>
       <dep package="glib"/>
-      <dep package="poppler-data"/>
     </suggests>
     <after>
       <dep package="gtk+-2"/>
@@ -847,6 +933,9 @@
             version="0.12"
             hash="sha256:3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"
             size="355285"/>
+    <dependencies>
+      <dep package="xcb-util"/>
+    </dependencies>
   </autotools>
 
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings">
@@ -864,8 +953,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="telepathy-logger"
-             autogenargs="--disable-Werror">
+  <autotools id="telepathy-logger" autogenargs="--disable-Werror">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -889,7 +977,11 @@
     </suggests>
   </autotools>
 
-  <autotools id="tracker" autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no" 
check-target="false">
+  <!-- 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 --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --disable-tracker-search-bar --disable-tracker-explorer 
--with-unicode-support=libicu"
+             check-target="false">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -899,7 +991,7 @@
     <suggests>
       <dep package="libgnome-keyring"/>
       <dep package="gstreamer-0.10"/>
-      <dep package="nautilus"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="NetworkManager"/>
       <dep package="evolution"/>
       <dep package="upower"/>
@@ -917,14 +1009,36 @@
     </dependencies>
   </autotools>
 
+  <autotools id="graphviz">
+    <pkg-config>libgvc.pc</pkg-config>
+    <branch repo="graphviz.org"
+            module="graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz" version="2.28.0"
+            hash="md5:8d26c1171f30ca3b1dc1b429f7937e58"
+            size="19620087">
+    </branch>
+  </autotools>
+
+  <autotools id="valadoc">
+    <branch />
+    <dependencies>
+      <dep package="libgee-0.6"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="graphviz"/>
+    </dependencies>
+  </autotools>
+
+  <!-- bugs that prevent webkit for supporting parallel build:
+       https://bugs.webkit.org/show_bug.cgi?id=79498
+       http://savannah.gnu.org/bugs/?30653
+  -->
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --enable-webkit2 --with-gstreamer=0.11">
+             autogenargs="--enable-introspection --disable-silent-rules --with-gstreamer=1.0"
+             supports-parallel-builds="no">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkit-1.9.2.tar.xz"
-            version="1.9.2"
-            hash="sha256:1e0cc3cdc7a7a6ad93b57eabc6f16141a1178216e7c4162bce59e770db32d194"
-            size="8944804">
+            module="webkitgtk-1.10.0.tar.xz" version="1.10.0"
+            hash="sha256:6db37376d387dcc980e5349a5a385d87d40909371796e3dd895817e466799034"
+            size="8597932">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
@@ -939,6 +1053,10 @@
       <dep package="pango"/>
       <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
+      <dep package="gperf"/>
+      <dep package="libicu"/>
+      <dep package="libXt"/>
+      <dep package="ruby"/>
     </dependencies>
     <suggests>
       <dep package="libxslt"/>
@@ -948,7 +1066,7 @@
   </autotools>
 
  <autotools id="vte" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
-    <branch revision="vte-0-32"/>
+    <branch revision="vte-0-34"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -982,7 +1100,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -1002,6 +1120,7 @@
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="gudev"/>
+      <dep package="libusb1"/>
       <dep package="libgusb"/>
       <dep package="sqlite3"/>
       <dep package="lcms2"/>
@@ -1015,13 +1134,93 @@
   </autotools>
 
   <autotools id="libwacom">
-    <branch repo="linuxwacom.git.sourceforge.net" module="gitroot/linuxwacom/libwacom" 
checkoutdir="libwacom"/>
+    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.6.tar.bz2" version="0.6"
+            hash="sha256:7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d"
+            md5sum="33dc2f4d8230754305c3f59525f04550" size="372573"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gudev"/>
     </dependencies>
   </autotools>
 
+  <autotools id="libpwquality">
+    <branch repo="libpwquality"
+            module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.1.0.tar.bz2"; 
version="1.1.0"
+            hash="sha256:1aad05fd8801165aa5c14badf06d3b8c94b2f4213016e0f09d73a3973c41db93"
+            md5sum="21db9a7877ab14b0fb29d4448c798de6" size="358017"/>
+    <dependencies>
+      <dep package="cracklib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ibus"
+             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui"
+             makeargs="CFLAGS=-Wno-error">
+    <branch repo="ibus"
+            module="ibus-1.4.99.20120822.tar.gz" version="1.4.99.20120822"
+            hash="sha1:46d836b68733953b443859f47ad6991f4584658d" size="1736787">
+    </branch>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="gconf"/> <!-- need it for gconf-2.m4, even though we disable gconf -->
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="dconf"/>
+      <dep package="iso-codes"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <cmake id="opencc">
+    <branch repo="opencc"
+            module="opencc-0.3.0.tar.gz" version="0.3.0"
+            hash="sha1:76f1750751b7fe15d25d66f0378814434fad1e70" size="491179"/>
+  </cmake>
+
+  <autotools id="ibus-pinyin"
+             autogenargs="--enable-db-open-phrase --enable-opencc --disable-boost"
+             makeargs="CFLAGS=-Wno-error">
+    <branch repo="ibus"
+            module="ibus-pinyin-1.4.99.20120620.tar.gz" version="1.4.99.20120620"
+            hash="sha1:acfadeb1903789f56c6f89ccb5e6a0064be54604" size="1817269"/>
+    <dependencies>
+      <dep package="ibus"/>
+      <dep package="opencc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="anthy">
+    <branch repo="anthy"
+            module="anthy-9100h.tar.gz" version="9100h"
+            hash="sha1:bfea9e74e208c4b976b6bd7ac6784cd290c636fd" size="4446148"/>
+  </autotools>
+
+  <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
+    <branch repo="ibus"
+            module="ibus-anthy-1.4.99.20120713.tar.gz" version="1.4.99.20120713"
+            hash="sha1:28b285228608d09dd79df492e74660b199095f77" size="553048"/>
+    <dependencies>
+      <dep package="ibus"/>
+      <dep package="anthy"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libhangul">
+    <branch repo="libhangul"
+            module="libhangul-0.1.0.tar.gz" version="0.1.0"
+            hash="sha1:9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77" size="2899845"/>
+  </autotools>
+
+  <autotools id="ibus-hangul">
+    <branch repo="ibus"
+            module="ibus-hangul-1.4.1.tar.gz" version="1.4.1"
+            hash="sha1:659899cf942a983fbd2ffbb4bd4f5ecd883f5c0a" size="484065"/>
+    <dependencies>
+      <dep package="ibus"/>
+      <dep package="libhangul"/>
+    </dependencies>
+  </autotools>
+
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
diff --git a/gnome-core.modules b/gnome-core.modules
index 546105d..043738b 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -10,7 +10,7 @@
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/"/>
   <repository type="git" name="telepathy.freedesktop.org"
-      href="git://anongit.freedesktop.org/telepathy/"/>
+    href="git://anongit.freedesktop.org/telepathy/"/>
   <repository type="git" name="packagekit.gitorious.org"
       href="git://gitorious.org/packagekit"/>
 
@@ -63,21 +63,24 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server" supports-non-srcdir-builds="no" autogenargs="--enable-vala-bindings 
--disable-weather">
+  <autotools id="evolution-data-server"
+             supports-non-srcdir-builds="no"
+             autogenargs="--enable-vala-bindings">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
       <dep package="sqlite3"/>
+      <dep package="gcr"/>
       <dep package="libgweather"/>
       <dep package="libical"/>
       <dep package="libgdata"/>
       <dep package="gnome-online-accounts"/>
       <dep package="liboauth"/>
       <dep package="vala"/>
+      <dep package="libdb"/>
     </dependencies>
     <suggests>
       <dep package="nspr"/>
@@ -96,6 +99,7 @@
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="libnotify"/>
+      <dep package="nautilus-sendto"/>
     </dependencies>
     <suggests>
       <dep package="geoclue"/>
@@ -107,16 +111,17 @@
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
-      <dep package="libgnome-keyring"/>
       <dep package="libnotify"/>
       <dep package="librest"/>
       <dep package="json-glib"/>
+      <dep package="libsecret"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
+      <dep package="clutter-gtk"/>
       <dep package="colord"/>
       <dep package="fontconfig"/>
       <dep package="gdk-pixbuf"/>
@@ -124,7 +129,6 @@
       <dep package="gtk+"/>
       <dep package="gnome-bluetooth"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-settings-daemon"/>
@@ -133,21 +137,27 @@
       <dep package="iso-codes"/>
       <dep package="libcanberra"/>
       <dep package="libgtop"/>
-      <dep package="libgnomekbd"/>
       <dep package="libnotify"/>
+      <dep package="libpwquality"/>
       <dep package="libwacom"/>
-      <dep package="libxklavier"/>
       <dep package="libxml2"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="sound-theme-freedesktop"/>
       <dep package="upower"/>
+      <dep package="ibus"/>
     </dependencies>
     <suggests>
       <!-- <dep package="cups"/> -->
       <dep package="accountsservice"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="cheese"/>
+      <dep package="gstreamer"/>
       <dep package="NetworkManager"/>
+      <dep package="network-manager-applet"/>
+      <dep package="realmd"/>
+      <dep package="ibus-pinyin"/>
+      <dep package="ibus-anthy"/>
+      <dep package="ibus-hangul"/>
     </suggests>
   </autotools>
 
@@ -155,11 +165,14 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
+      <dep package="libxkbfile"/>
+      <dep package="libXrandr"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
+      <dep package="yelp-tools"/> <!-- for the docs -->
+      <dep package="xkeyboard-config"/>
     </dependencies>
   </autotools>
 
@@ -249,13 +262,14 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
+      <dep package="gl"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
       <dep package="json-glib"/>
       <dep package="dbus-glib"/>
       <dep package="startup-notification"/>
       <dep package="upower"/>
       <dep package="librsvg"/>
+      <dep package="libXcomposite"/>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
@@ -268,22 +282,22 @@
       <dep package="colord"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
       <dep package="gudev"/>
       <dep package="intltool"/>
-      <dep package="libgnomekbd"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
       <dep package="libwacom"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
+      <dep package="ibus"/>
+      <dep package="xorg-wacom"/>
     </dependencies>
     <suggests>
       <!-- <dep package="cups"/> -->
-      <dep package="gstreamer-0.10"/>
+      <!-- <dep package="xkbfile"/> -->
     </suggests>
   </autotools>
 
@@ -294,7 +308,7 @@
       <dep package="caribou"/>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
-      <dep package="folks"/>
+      <dep package="gdm"/> <!-- runtime dependency on Gdm-1.0.typelib-->
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gnome-bluetooth"/>
@@ -319,8 +333,8 @@
       <dep package="gcr"/>
     </dependencies>
     <suggests>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -356,6 +370,7 @@
     <suggests>
       <dep package="gnome-disk-utility"/>
       <dep package="gudev"/>
+      <dep package="libgphoto2"/>
     </suggests>
   </autotools>
 
@@ -365,6 +380,9 @@
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="intltool"/>
+      <dep package="libXcursor"/>
+      <dep package="libXfixes"/>
+      <dep package="libXtst"/>
     </dependencies>
   </autotools>
 
@@ -375,20 +393,21 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="startup-notification"/>
       <dep package="zenity"/>
       <dep package="clutter"/>
       <dep package="gobject-introspection"/>
       <dep package="libcanberra"/>
+      <dep package="libXinerama"/>
     </dependencies>
   </autotools>
 
   <autotools id="network-manager-applet" autogenargs="--enable-more-warnings=no">
-    <branch/>
+    <branch revision="nma-0-9-6"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
       <dep package="libgnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
@@ -401,19 +420,19 @@
 
   <autotools id="pulseaudio" autogenargs="--disable-udev --disable-hal --disable-oss">
     <pkg-config>libpulse.pc</pkg-config>
-    <branch repo="freedesktop.org" module="software/pulseaudio/releases/pulseaudio-1.0.tar.xz"
-            version="1.0"
-            hash="sha256:e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be"
-            size="1305008"/>
+    <branch repo="freedesktop.org" module="software/pulseaudio/releases/pulseaudio-2.0.tar.xz"
+            version="2.0"
+            hash="sha256:28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061"
+            size="1353708"/>
     <dependencies>
       <dep package="json"/>
       <dep package="libsndfile"/>
       <dep package="liboil"/>
+      <dep package="libtool-ltdl"/>
       <dep package="glib"/>
       <dep package="speex"/>
     </dependencies>
     <after>
-      <dep package="libsamplerate"/>
       <dep package="gconf"/>
       <dep package="avahi"/>
       <dep package="bluez"/>
@@ -422,8 +441,7 @@
     </after>
   </autotools>
 
-  <autotools id="telepathy-mission-control"
-             autogenargs="--disable-Werror">
+  <autotools id="telepathy-mission-control" autogenargs="--disable-Werror">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="dbus"/>
@@ -457,11 +475,11 @@
       <dep package="libwnck"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-menus"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="dbus-glib"/>
       <dep package="librsvg"/>
       <dep package="libgweather"/>
       <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
@@ -500,8 +518,8 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="vala"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -510,10 +528,12 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
       <dep package="libxml2"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="nautilus"/>
@@ -529,17 +549,17 @@
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="dbus-glib"/>
-      <dep package="evolution-data-server"/>
       <dep package="intltool"/>
       <dep package="farstream"/>
       <dep package="folks"/>
       <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="libgnome-keyring"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libsecret"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnutls"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
       <dep package="libsoup"/>
@@ -591,12 +611,13 @@
       <dep package="intltool"/>
       <dep package="iso-codes"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="startup-notification"/>
       <dep package="WebKit"/>
+      <dep package="gcr"/>
+      <dep package="avahi"/>
+      <dep package="gnome-desktop"/>
     </dependencies>
     <suggests>
-      <dep package="avahi"/>
       <dep package="enchant"/>
       <dep package="libnotify"/>
       <dep package="libcanberra"/>
@@ -614,9 +635,9 @@
       <dep package="libxml2"/>
       <dep package="gnome-icon-theme"/>
       <dep package="poppler"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="nautilus"/>
       <dep package="libgxps"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="libgnome-keyring"/>
@@ -628,7 +649,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -637,10 +658,18 @@
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
       <dep package="gtk+"/>
+      <dep package="libgee-0.6"/>
       <dep package="libnotify"/>
+      <dep package="telepathy-glib"/>
       <dep package="vala"/>
     </dependencies>
+    <suggests>
+      <dep package="cheese"/>
+      <dep package="gstreamer"/>
+    </suggests>
   </autotools>
 
   <autotools id="gnome-dictionary">
@@ -649,7 +678,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -658,6 +687,9 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
+      <dep package="libpwquality"/>
+      <dep package="libsecret"/>
+      <dep package="udisks"/>
     </dependencies>
   </autotools>
 
@@ -667,7 +699,6 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
     </dependencies>
   </autotools>
 
@@ -677,17 +708,6 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-search-tool">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
     </dependencies>
   </autotools>
 
@@ -697,7 +717,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -717,7 +737,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
-    <branch revision="gnome-3-4"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -725,14 +745,13 @@
       <dep package="gconf"/>
       <dep package="vte"/>
       <dep package="startup-notification"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-user-docs">
     <branch/>
     <dependencies>
-      <dep package="gnome-doc-utils"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -743,7 +762,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -757,10 +776,10 @@
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-    <after>
       <dep package="tracker"/>
-    </after>
+      <dep package="exempi"/>
+      <dep package="libexif"/>
+    </dependencies>
   </autotools>
 
   <autotools id="sushi">
@@ -776,32 +795,31 @@
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
       <dep package="WebKit"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
   <autotools id="totem">
-    <branch />
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gst-plugins-good-0.10"/>
-      <dep package="gst-plugins-bad-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-bad"/>
       <dep package="iso-codes"/>
       <dep package="totem-pl-parser"/>
       <dep package="libpeas"/>
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
-      <dep package="mx"/>
       <dep package="grilo-plugins"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="brasero"/>
-      <dep package="libgdata"/>
     </suggests>
   </autotools>
 
@@ -833,8 +851,9 @@
     <dependencies>
       <dep package="avahi"/>
       <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="libcanberra"/>
       <dep package="libnotify"/>
-      <dep package="gconf"/>
       <dep package="gnome-bluetooth"/>
       <dep package="nautilus"/>
     </dependencies>
@@ -872,12 +891,14 @@
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
-  <autotools id="avahi" version="0.6.31" autogenargs="--disable-gtk --enable-gtk3 --enable-introspection=no 
--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python 
--enable-compat-howl --enable-compat-libdns_sd --with-systemdsystemunitdir=no">
+  <autotools id="avahi" version="0.6.31" autogen-sh="configure"
+             autogenargs="--disable-gtk --disable-gtk3 --enable-introspection=no --disable-qt3 --disable-qt4 
--disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl 
--enable-compat-libdns_sd --with-systemdsystemunitdir=no">
     <pkg-config>avahi-ui-gtk3.pc</pkg-config>
     <branch repo="avahi.org" module="avahi-0.6.31.tar.gz" version="0.6.31"
             hash="sha256:8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
             size="1268686"/>
     <dependencies>
+      <dep package="gdbm"/>
       <dep package="gtk+"/>
       <dep package="libdaemon"/>
     </dependencies>
@@ -921,7 +942,6 @@
       <dep package="accountsservice"/>
       <dep package="dbus-glib"/>
       <dep package="fontconfig"/>
-      <dep package="gconf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
@@ -931,6 +951,7 @@
     <suggest>
       <dep package="libxklavier"/>
       <dep package="upower"/>
+      <dep package="yelp-tools"/>
     </suggest>
   </autotools>
 
@@ -943,10 +964,14 @@
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="libgcrypt"/>
+      <dep package="libuuid"/>
       <dep package="gtk-doc"/>
       <dep package="polkit"/>
       <dep package="gudev"/>
       <dep package="gnutls"/>
+      <dep package="ppp"/>
+      <dep package="vala"/>
+      <dep package="wireless-tools"/>
     </dependencies>
   </autotools>
 
@@ -972,6 +997,16 @@
       <dep package="gobject-introspection"/>
       <dep package="expat"/>
       <dep package="intltool"/>
+      <dep package="js185"/>
+      <dep package="pam"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="realmd" autogenargs="">
+    <branch repo="git.freedesktop.org" module="realmd/realmd"/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="PackageKit"/>
     </dependencies>
   </autotools>
 
@@ -1007,13 +1042,13 @@
       <dep package="gnome-disk-utility"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-screenshot"/>
-      <dep package="gnome-search-tool"/>
       <dep package="gnome-system-log"/>
       <dep package="gnome-system-monitor"/>
       <dep package="gnome-terminal"/>
       <dep package="gucharmap"/>
       <dep package="nautilus"/>
       <dep package="sushi"/>
+      <dep package="totem"/>
       <dep package="yelp"/>
     </dependencies>
   </metamodule>
@@ -1034,7 +1069,6 @@
       <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-packagekit"/>
-      <dep package="gnome-screensaver"/>
       <dep package="gnome-session"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gnome-shell"/>
@@ -1065,6 +1099,7 @@
   <metamodule id="meta-gnome-core-shell-fallback">
     <dependencies>
       <dep package="gnome-panel"/>
+      <dep package="gnome-screensaver"/>
       <dep package="metacity"/>
       <dep package="notification-daemon"/>
       <!-- workaround to ensure that dbus-python is around for
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
new file mode 100644
index 0000000..5dfa3ce
--- /dev/null
+++ b/gnome-sysdeps.modules
@@ -0,0 +1,359 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+
+<!-- gnome-sysdeps modules. A list of systemmodules. The systemmodule element
+     is used to specify modules that must be provided by the system. -->
+
+<moduleset>
+
+  <repository type="system" name="system"/>
+
+  <systemmodule id="bison">
+    <branch repo="system" version="2.0"/>
+    <systemdependencies>
+      <dep type="path" name="bison"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="boost">
+    <branch repo="system" version="1.33.1"/>
+    <systemdependencies>
+      <dep type="c_include" name="boost/variant.hpp"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="cracklib">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="crack.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="cyrus-sasl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="sasl/sasl.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="device-mapper">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="libdevmapper.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="exiv2">
+    <pkg-config>exiv2.pc</pkg-config>
+    <branch repo="system" version="0"/>
+  </systemmodule>
+
+  <systemmodule id="file">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="magic.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="flac">
+    <pkg-config>flac.pc</pkg-config>
+    <branch repo="system" version="1.1.4"/>
+  </systemmodule>
+
+  <systemmodule id="flex">
+    <branch repo="system" version="2.0"/>
+    <systemdependencies>
+      <dep type="path" name="flex"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="gc">
+    <pkg-config>bdw-gc.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="gdbm">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="gdbm.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="gettext">
+    <branch repo="system" version="0.16"/>
+    <systemdependencies>
+      <dep type="c_include" name="gettext-po.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="gl">
+    <pkg-config>gl.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="glu">
+    <pkg-config>glu.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="gperf">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="gperf"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libXcomposite">
+    <pkg-config>xcomposite.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libXcursor">
+    <pkg-config>xcursor.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libXfixes">
+    <pkg-config>xfixes.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libXft">
+    <pkg-config>xft.pc</pkg-config>
+    <branch repo="system" version="2.0.0"/>
+  </systemmodule>
+
+  <systemmodule id="libXinerama">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="X11/extensions/Xinerama.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libXrandr">
+    <pkg-config>xrandr.pc</pkg-config>
+    <branch repo="system" version="1.3"/>
+  </systemmodule>
+
+  <systemmodule id="libXt">
+    <pkg-config>xt.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libXtst">
+    <pkg-config>xtst.pc</pkg-config>
+    <branch repo="system" version="1"/>
+  </systemmodule>
+
+  <systemmodule id="libXv">
+    <pkg-config>xv.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libacl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="sys/acl.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libdb">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="db.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libffi">
+    <pkg-config>libffi.pc</pkg-config>
+    <branch repo="system" version="3.0.0"/>
+  </systemmodule>
+
+  <systemmodule id="libicu">
+    <pkg-config>icu-i18n.pc</pkg-config>
+    <branch repo="system" version="4"/>
+  </systemmodule>
+
+  <systemmodule id="libjpeg">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="jpeglib.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libpng">
+    <pkg-config>libpng.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libtiff">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="tiff.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libtool-ltdl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="ltdl.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libunistring">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="unistring/version.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libusb1">
+    <pkg-config>libusb-1.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libuuid">
+    <pkg-config>uuid.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libv4l">
+    <pkg-config>libv4l2.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libvorbis">
+    <pkg-config>vorbisfile.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libvpx">
+    <pkg-config>vpx.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libxkbfile">
+    <pkg-config>xkbfile.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="mpfr">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="mpfr.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="neon">
+    <pkg-config>neon.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="openssl">
+    <pkg-config>libcrypto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="pam">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="security/pam_appl.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="ppp">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="pppd/pppd.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="python-devel">
+    <pkg-config>python.pc</pkg-config>
+    <branch repo="system" version="2.5"/>
+  </systemmodule>
+
+  <systemmodule id="readline">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="readline/readline.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="ruby">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="ruby"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="soundtouch">
+    <pkg-config>soundtouch-1.4.pc</pkg-config>
+    <branch repo="system" version="0"/>
+  </systemmodule>
+
+  <systemmodule id="taglib">
+    <pkg-config>taglib.pc</pkg-config>
+    <branch repo="system" version="1.5"/>
+  </systemmodule>
+
+  <systemmodule id="udisks">
+    <pkg-config>udisks2.pc</pkg-config>
+    <branch repo="system" version="1.99"/>
+  </systemmodule>
+
+  <systemmodule id="wavpack">
+    <pkg-config>wavpack.pc</pkg-config>
+    <branch repo="system" version="4.2"/>
+  </systemmodule>
+
+  <systemmodule id="wget">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="wget"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="wireless-tools">
+    <branch repo="system" version="25"/>
+    <systemdependencies>
+      <dep type="c_include" name="wireless.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="xcb-util">
+    <pkg-config>xcb-aux.pc</pkg-config>
+    <branch repo="system" version="0.1"/>
+  </systemmodule>
+
+  <systemmodule id="xkeyboard-config">
+    <pkg-config>xkeyboard-config.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="xorg-wacom">
+    <pkg-config>xorg-wacom.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="yajl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="yajl/yajl_common.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="yasm">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="yasm"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="zlib">
+    <pkg-config>zlib.pc</pkg-config>
+    <branch repo="system" version="1.0"/>
+  </systemmodule>
+
+</moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index 317baaf..f1946ab 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -7,6 +7,8 @@
       href="git://git.gnome.org/"/>
   <repository type="git" name="git.clutter-project.org"
       href="http://git.clutter-project.org/"/>
+  <repository type="tarball" name="clutter-project.org"
+    href="http://source.clutter-project.org/sources/"/>
   <repository type="cvs" name="cairo.freedesktop.org"
       cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
       password=""/>
@@ -29,9 +31,7 @@
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="bzr" name="launchpad.net"
-      href="http://code.launchpad.net/"/>
-  <repository type="bzr" name="launchpad.net-lp"
-      href=""/>
+      href="lp:"/>
   <repository type="bzr" name="bzr.burtonini.com"
       href="http://burtonini.com/bzr/"/>
   <repository type="svn" name="elisa.code.fluendo.com"
@@ -92,6 +92,8 @@
       href="git://gitorious.org/"/>
   <repository type="tarball" name="samba.org"
       href="http://samba.org/samba/ftp/"/>
+  <repository type="hg" name="hg.sourceforge.net"
+    href="http://hg.sourceforge.net/"/>
   <repository type="tarball" name="sourceforge.net"
       href="http://prdownloads.sourceforge.net/sourceforge/"/>
   <repository type="svn" name="xchat.sf.net"
@@ -117,6 +119,34 @@
     </dependencies>
   </autotools>
 
+  <cmake id="geary">
+    <branch repo="yorba.org" module="geary"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gmime"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libnotify"/>
+      <dep package="libunique"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </cmake>
+
+  <autotools id="gnome-calendar">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-desktop-2" autogenargs="--with-gnome-distributor=JHBuild">
     <branch revision="gnome-2-32" checkoutdir="gnome-desktop-2" module="gnome-desktop"/>
     <dependencies>
@@ -131,51 +161,66 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cairo-gtk-engine">
-    <branch repo="cairo.freedesktop.org"/>
+  <autotools id="gnome-photos">
+    <branch/>
     <dependencies>
-      <dep package="gtk+-2"/>
       <dep package="cairo"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="tracker"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cluttersmith">
-    <branch repo="git.clutter-project.org"/>
+  <autotools id="gxml">
+    <branch/>
     <dependencies>
-      <dep package="gjs"/>
+      <dep package="gobject-introspection"/>
       <dep package="glib"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="mx"/>
+      <dep package="libgee"/>
+      <dep package="libxml2"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="sqlheavy">
-    <branch repo="gitorious.org" module="sqlheavy/sqlheavy"/>
+  <autotools id="cairo-gtk-engine">
+    <branch repo="cairo.freedesktop.org"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+-2"/>
-      <dep package="sqlite3"/>
+      <dep package="cairo"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mx">
+    <branch repo="clutter-project.org"
+            module="mx/1.4/mx-1.4.3.tar.xz"
+            version="1.4.3"
+            hash="sha256:d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5"
+            size="951232"/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="startup-notification"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
-  <waf id="geary">
-    <branch repo="yorba.org"/>
+  <autotools id="cluttersmith">
+    <branch repo="git.clutter-project.org"/>
     <dependencies>
+      <dep package="gjs"/>
       <dep package="glib"/>
-      <dep package="gmime"/>
-      <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
-      <dep package="libgee-0.6"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="libunique"/>
-      <dep package="sqlheavy"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="mx"/>
     </dependencies>
-  </waf>
+  </autotools>
 
   <waf id="hamster-applet" check-target="false">
     <branch/>
@@ -216,16 +261,15 @@
   </autotools>
 
   <autotools id="gnome-phone-manager">
-    <branch module="phonemgr"/>
+    <branch checkoutdir="gnome-phone-manager" module="phonemgr"/>
     <dependencies>
       <dep package="dbus-glib"/>
-      <dep package="evolution-data-server"/>
       <dep package="gconf"/>
-      <dep package="glib"/>
-      <dep package="gnokii"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gtk+"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gnokii"/>
       <dep package="gtkspell"/>
+      <dep package="evolution-data-server"/>
     </dependencies>
   </autotools>
 
@@ -317,14 +361,37 @@
     </suggests>
   </autotools>
 
+  <cmake id="libgit2">
+    <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="development"/>
+  </cmake>
+
+  <autotools id="libgit2-glib">
+    <branch/>
+    <dependencies>
+      <dep package="libgit2"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gitg">
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtksourceview"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="json-glib"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libgit2-glib"/>
+      <dep package="libpeas"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
     </dependencies>
+    <suggests>
+      <dep package="glade"/>
+      <dep package="pygobject2"/>
+    </suggests>
   </autotools>
 
   <autotools id="memprof">
@@ -356,103 +423,113 @@
       <dep package="glib"/>
       <dep package="avahi"/>
       <dep package="libsoup"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
   <autotools id="gst-openmax" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gst-openmax"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-bad-0.10"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gstreamer-vaapi" supports-non-srcdir-builds="no">
+  <autotools id="gstreamer-vaapi">
     <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libva"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libva" supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-            module="vaapi/libva"
-            revision="v1.0-branch"/>
+  <autotools id="libva">
+    <branch repo="git.freedesktop.org" module="vaapi/libva" revision="v1.0-branch"/>
   </autotools>
 
-  <autotools id="libva-intel-driver" supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-            module="vaapi/intel-driver"
-            revision="v1.0-branch"/>
+  <autotools id="libva-intel-driver">
+    <branch repo="git.freedesktop.org" checkoutdir="libva-intel-driver" module="vaapi/intel-driver" 
revision="v1.0-branch"/>
   </autotools>
 
-  <autotools id="gst-plugins-ugly" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-ugly"/>
+  <autotools id="gst-plugins-bad-0.10"
+             autogenargs="--disable-tests --disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-bad"
+            revision="0.10" checkoutdir="gst-plugins-bad-0.10"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-bad" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-bad"/>
+  <autotools id="gst-plugins-ugly-0.10" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-ugly"
+            revision="0.10" checkoutdir="gst-plugins-ugly-0.10"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="yasm"/>
     </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-gl" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gst-plugins-gl"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
   <autotools id="gst-ffmpeg" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-ffmpeg"/>
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-ffmpeg"
+            revision="0.10"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-python" autogenargs="--" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-python"/>
+  <autotools id="gst-libav"
+             autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-ffmpeg"/>
     <dependencies>
-      <dep package="pygobject2"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="transmageddon">
-    <branch revision="master"/>
+  <autotools id="gst-python"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS="
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-python"
+            revision="0.10"/>
     <dependencies>
-      <dep package="pygobject"/>
-      <dep package="pygtk"/>
-      <dep package="gst-python"/>
+      <dep package="pygobject2"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
-    <suggests>
-      <dep package="gstreamer-plugins-base"/>
-      <dep package="gstreamer-plugins-good"/>
-      <dep package="gstreamer-plugins-bad"/>
-      <dep package="gstreamer-plugins-ugly"/>
-      <dep package="gstreamer-ffmpeg"/>
-    </suggests>
   </autotools>
 
   <autotools id="planner">
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
       <dep package="libxml2"/>
-      <dep package="libgsf"/>
+      <dep package="libxslt"/>
     </dependencies>
+    <suggests>
+      <dep package="pygtk"/>
+      <dep package="pygobject2"/>
+    </suggests>
   </autotools>
 
   <autotools id="balsa">
@@ -594,21 +671,21 @@
     <branch/>
     <dependencies>
       <dep package="gtkmm"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libxml++"/>
     </dependencies>
     <suggests>
-      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="gst-ffmpeg"/>
-      <dep package="gst-plugins-ugly"/>
+      <dep package="gst-plugins-ugly-0.10"/>
     </suggests>
   </autotools>
 
   <autotools id="gstreamermm-plugins-good">
     <branch/>
     <dependencies>
-      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="gstreamermm"/>
     </dependencies>
   </autotools>
@@ -879,7 +956,7 @@
       <dep package="gtk+-2"/>
       <dep package="gnome-python-extras"/>
       <dep package="pygtk"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="gst-python"/>
     </dependencies>
   </autotools>
@@ -888,28 +965,43 @@
     <branch/>
     <dependencies>
       <dep package="gtk+-2"/>
+      <dep package="gstreamer-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnonlin"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gnonlin"/>
+    <dependencies>
       <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnonlin">
-    <branch repo="gstreamer.freedesktop.org" module="gnonlin"/>
+  <autotools id="gst-editing-services"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-editing-services"/>
     <dependencies>
+      <dep package="glib"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-bad"/>
     </dependencies>
   </autotools>
 
   <autotools id="pitivi">
     <branch/>
     <dependencies>
-      <dep package="pygtk"/>
-      <dep package="py2cairo"/>
       <dep package="gstreamer"/>
-      <dep package="gst-python"/>
       <dep package="gnonlin"/>
+      <dep package="goocanvas"/>
+      <dep package="gst-editing-services"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
+      <dep package="pygobject"/>
+      <dep package="py2cairo"/>
     </dependencies>
   </autotools>
 
@@ -923,12 +1015,16 @@
   <autotools id="xchat-gnome">
     <branch/>
     <dependencies>
-      <dep package="gtk+-2" />
-      <dep package="gconf" />
-      <dep package="libglade" />
-      <dep package="libsexy" />
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
+    <suggests>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libcanberra"/>
+      <dep package="libnotify"/>
+    </suggests>
   </autotools>
 
  <autotools id="refdbg" autogen-sh="autoreconf">
@@ -955,6 +1051,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-scan">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
+      <dep package="gegl"/>
+      <dep package="gimp"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gimmie">
     <branch/>
     <dependencies>
@@ -1146,6 +1252,17 @@
     </dependencies>
   </tarball>
 
+  <autotools id="monkey-bubble">
+    <branch/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="mono-tools">
     <branch repo="github.com" module="mono/mono-tools.git" checkoutdir="mono-tools"/>
     <dependencies>
@@ -1202,16 +1319,16 @@
    <branch repo="svn.fluendo.com" />
    <dependencies>
      <dep package="liboil"/>
-     <dep package="gstreamer"/>
-     <dep package="gst-plugins-base"/>
+     <dep package="gstreamer-0.10"/>
+     <dep package="gst-plugins-base-0.10"/>
    </dependencies>
  </autotools>
 
  <autotools id="gst-fluendo-mpegdemux">
    <branch repo="svn.fluendo.com" />
    <dependencies>
-     <dep package="gstreamer"/>
-     <dep package="gst-plugins-base"/>
+     <dep package="gstreamer-0.10"/>
+     <dep package="gst-plugins-base-0.10"/>
    </dependencies>
  </autotools>
 
@@ -1310,6 +1427,17 @@
     </suggests>
   </tarball>
 
+  <autotools id="gtkspell-3">
+    <branch repo="hg.sourceforge.net"
+            module="gtkspell/gtkspell"
+            checkoutdir="gtkspell"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gtk-doc"/>
+      <dep package="pango"/>
+    </dependencies>
+  </autotools>
+
   <tarball id="gtkspell" version="2.0.16">
     <source href="http://sourceforge.net/projects/gtkspell/files/2.0.16/gtkspell-2.0.16.tar.gz";
             hash="sha256:8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02"
@@ -1336,22 +1464,19 @@
   </autotools> 
 
   <autotools id="goocanvas">
-    <branch/>
+    <branch revision="goocanvas-1.0"/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
-  <!-- This is needed to render the canvas in conduits Gtk and Hildon GUIs -->
-  <tarball id="pygoocanvas" version="0.9">
-    <source href="http://download.berlios.de/pygoocanvas/pygoocanvas-0.9.0.tar.gz";
-            hash="sha256:3fa0944b57253b9981a1ea1baa92fc03a0d746a49d779b9c5f51080959c7e011"
-            md5sum="1988b7572d553d954ffd159e7e61cb17" size="430723"/>
+  <autotools id="pygoocanvas">
+    <branch/>
     <dependencies>
       <dep package="goocanvas"/>
       <dep package="pygtk"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
   <!-- Conduit needs this to integrate with data from Evolution out of the box. -->
   <repository type="tarball" name="skyhouseconsulting.com"
@@ -1465,16 +1590,46 @@
       <dep package="poppler"/>
       <dep package="libnotify"/>
       <dep package="gssdp"/>
-      <dep package="gnupnp"/>
+      <dep package="gupnp"/>
     </suggests>
   </autotools>
 
+  <autotools id="dee">
+    <branch repo="launchpad.net"
+            module="dee"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gwibber"
+             autogenargs="--disable-unity">
+    <branch repo="launchpad.net"
+            module="gwibber"/>
+    <dependencies>
+      <dep package="dee"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="gtkspell-3"/>
+      <dep package="json-glib"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libnotify"/>
+      <dep package="libsoup"/>
+      <dep package="pygobject"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <!-- ########## Ubuntu Netbook Remix Modules ########## -->
 
   <autotools id="maximus">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/maximus"
-            checkoutdir="maximus"/>
+            module="maximus"/>
     <dependencies>
       <dep package="gtk+-2"/>
       <dep package="gconf"/>
@@ -1485,8 +1640,7 @@
 
  <autotools id="window-picker-applet">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/window-picker-applet"
-            checkoutdir="window-picker-applet"/>
+            module="window-picker-applet"/>
     <dependencies>
       <dep package="gnome-panel"/>
       <dep package="gconf"/>
@@ -1497,8 +1651,7 @@
 
  <autotools id="go-home-applet">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/go-home-applet"
-            checkoutdir="go-home-applet"/>
+            module="go-home-applet"/>
     <dependencies>
       <dep package="gnome-panel"/>
       <dep package="gnome-desktop-2"/>
@@ -1510,8 +1663,7 @@
 
  <autotools id="netbook-remix-launcher">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix-launcher/trunk"
-            checkoutdir="netbook-remix-launcher"/>
+            module="netbook-remix-launcher"/>
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="clutter"/>
@@ -1528,8 +1680,7 @@
 
  <autotools id="desktop-switcher">
    <branch repo="launchpad.net"
-           module="~netbook-remix-team/netbook-remix/desktop-switcher"
-           checkoutdir="desktop-switcher"/>
+           module="desktop-switcher"/>
    <dependencies>
      <dep package="gtk+-2"/>
      <dep package="gconf"/>
@@ -1565,8 +1716,8 @@
     <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
@@ -1574,11 +1725,11 @@
    <branch />
    <dependencies>
      <dep package="glib"/>
-     <dep package="gstreamer"/>
+     <dep package="gstreamer-0.10"/>
      <dep package="gst-rtsp-server"/>
      <dep package="vala"/>
-     <dep package="gst-plugins-good"/>
-     <dep package="gst-plugins-bad"/>
+     <dep package="gst-plugins-good-0.10"/>
+     <dep package="gst-plugins-bad-0.10"/>
      <dep package="libgee-0.6"/>
      <dep package="sqlite3"/>
      <dep package="pygobject2"/>
@@ -1934,9 +2085,8 @@
   </autotools>
 
   <autotools id="zeitgeist">
-    <branch repo="launchpad.net-lp"
-            module="lp:zeitgeist"
-            checkoutdir="zeitgeist"/>
+    <branch repo="launchpad.net"
+            module="zeitgeist"/>
     <dependencies>
       <dep package="pygtk"/>
       <dep package="sqlite3"/>
@@ -1944,10 +2094,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libzeitgeist">
-    <branch repo="launchpad.net-lp"
-            module="lp:libzeitgeist"
-            checkoutdir="libzeitgeist"/>
+  <autotools id="libzeitgeist-trunk">
+    <branch repo="launchpad.net"
+            module="libzeitgeist-trunk"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="vala"/>
@@ -1955,17 +2104,15 @@
   </autotools>
 
   <distutils id="fungtk">
-    <branch repo="launchpad.net-lp"
-            module="lp:fungtk"
-            checkoutdir="fungtk"/>
+    <branch repo="launchpad.net"
+            module="fungtk"/>
     <dependencies>
     </dependencies>
   </distutils>
 
   <distutils id="gnome-activity-journal">
-    <branch repo="launchpad.net-lp"
-            module="lp:gnome-activity-journal"
-            checkoutdir="gnome-activity-journal"/>
+    <branch repo="launchpad.net"
+            module="gnome-activity-journal"/>
     <dependencies>
       <dep package="py2cairo"/>
       <dep package="pygtk"/>
@@ -1988,13 +2135,25 @@
     </dependencies>
   </autotools>
 
+  <autotools id="clutter-gst-0.10">
+    <branch module="clutter-gst" checkoutdir="clutter-gst-0.10" revision="clutter-gst-1.6"/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
   <autotools id="ease">
     <branch/>
     <dependencies>
       <dep package="vala"/>
       <dep package="libgee-0.6"/>
       <dep package="clutter-gtk"/>
-      <dep package="clutter-gst"/>
+      <dep package="clutter-gst-0.10"/>
       <dep package="json-glib"/>
     </dependencies>
   </autotools>
@@ -2099,12 +2258,13 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gconf"/>
       <dep package="gtk+"/>
       <dep package="libsoup"/>
       <dep package="intltool"/>
       <dep package="evolution-data-server"/>
       <dep package="evolution"/>
+      <dep package="sqlite3"/>
+      <dep package="libical"/>
     </dependencies>
   </autotools>
 
@@ -2193,4 +2353,73 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-ugly"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-ugly"
+            module="gst-plugins-ugly"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="linux-user-chroot">
+    <branch/>
+  </autotools>
+
+  <autotools id="ostree">
+    <branch/>
+    <dependencies>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-ostree">
+    <branch/>
+    <dependencies>
+      <dep package="ostree"/>
+    </dependencies>
+  </autotools>
+
+  <distutils id="gnome-clocks">
+    <branch/>
+    <dependencies>
+      <dep package="pygobject"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="clutter-gtk"/>
+      <dep package="libgweather"/>
+      <dep package="libnotify"/>
+    </dependencies>
+  </distutils>
+
+  <autotools id="latexila">
+    <branch/>
+    <dependencies>
+      <dep package="gtksourceview"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="vala"/>
+      <dep package="libgee-0.6"/>
+      <dep package="enchant"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="tumbler">
+    <branch repo="git.xfce.org"
+            module="xfce/tumbler"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="libgsf"/>
+      <dep package="poppler"/>
+    </suggests>
+  </autotools>
+
 </moduleset>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]