From ef388964f917c25ea866e537f44f2d88f9e6b85c Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Mon, 26 Nov 2012 16:46:21 +0000
Subject: Normalize deps json

Sort the list, always specify the name, json.dump them.
---
(limited to 'config')

diff --git a/config/deps/prerequisites.json b/config/deps/prerequisites.json
index 63d18f5..d1ade06 100644
--- a/config/deps/prerequisites.json
+++ b/config/deps/prerequisites.json
@@ -1,4 +1,12 @@
-[{ "check": "Xvfb",
-   "checker": "binary" },
- { "check": "pkg-config",
-   "checker": "binary" }]
+[
+    {
+        "check": "Xvfb", 
+        "checker": "binary", 
+        "name": "Xvfb"
+    }, 
+    {
+        "check": "pkg-config", 
+        "checker": "binary", 
+        "name": "pkg-config"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/sugar-build.json b/config/deps/sugar-build.json
index be66df2..0bec31b 100644
--- a/config/deps/sugar-build.json
+++ b/config/deps/sugar-build.json
@@ -1,22 +1,52 @@
-[{ "check": "atk-bridge",
-   "checker": "gtkmodule" },
- { "check_name": "gail gtkmodule",
-   "check": "gail",
-   "checker": "gtkmodule" },
- { "check": "xinit",
-   "checker": "binary" },
- { "check": "xz",
-   "checker": "binary" },
- { "check": "scp",
-   "checker": "binary" },
- { "check": "Xephyr",
-   "checker": "binary" },
- { "check": "dbus-launch",
-   "checker": "binary" },
- { "check_name": "atspi typelib",
-   "check": "from gi.repository import Atspi",
-   "checker": "python" },
- { "check": "xrandr",
-   "checker": "pkgconfig" },
- { "check": "x11",
-   "checker": "pkgconfig" }]
+[
+    {
+        "check": "Xephyr", 
+        "checker": "binary", 
+        "name": "Xephyr"
+    }, 
+    {
+        "check": "atk-bridge", 
+        "checker": "gtkmodule", 
+        "name": "atk-bridge"
+    }, 
+    {
+        "check": "from gi.repository import Atspi", 
+        "checker": "python", 
+        "name": "atspi typelib"
+    }, 
+    {
+        "check": "dbus-launch", 
+        "checker": "binary", 
+        "name": "dbus-launch"
+    }, 
+    {
+        "check": "gail", 
+        "checker": "gtkmodule", 
+        "name": "gail gtkmodule"
+    }, 
+    {
+        "check": "scp", 
+        "checker": "binary", 
+        "name": "scp"
+    }, 
+    {
+        "check": "x11", 
+        "checker": "pkgconfig", 
+        "name": "x11"
+    }, 
+    {
+        "check": "xinit", 
+        "checker": "binary", 
+        "name": "xinit"
+    }, 
+    {
+        "check": "xrandr", 
+        "checker": "pkgconfig", 
+        "name": "xrandr"
+    }, 
+    {
+        "check": "xz", 
+        "checker": "binary", 
+        "name": "xz"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/sugar-buildtime-3.4.json b/config/deps/sugar-buildtime-3.4.json
index 80bb4cb..2a56c4f 100644
--- a/config/deps/sugar-buildtime-3.4.json
+++ b/config/deps/sugar-buildtime-3.4.json
@@ -1,50 +1,127 @@
-[{ "check": "gcc",
-   "checker": "binary" },
- { "check": "autoreconf",
-   "checker": "binary" },
- { "check": "sphinx-build",
-   "checker": "binary" },
- { "check": "xrdb",
-   "checker": "binary" },
- { "check": "aclocal",
-   "checker": "binary" },
- { "check": "libtool",
-   "checker": "binary" },
- { "check": "icon-slicer",
-   "checker": "binary" },
- { "check": "intltoolize",
-   "checker": "binary" },
- { "check": "xcursorgen",
-   "checker": "binary" },
- { "check": "gnome-doc-common",
-   "checker": "binary" },
- { "check": "python",
-   "checker": "pkgconfig" },
- { "check": "glib-2.0",
-   "checker": "pkgconfig" },
- { "check": "gtk+-3.0",
-   "checker": "pkgconfig" },
- { "check": "sm",
-   "checker": "pkgconfig" },
- { "check": "ice",
-   "checker": "pkgconfig" },
- { "check": "alsa",
-   "checker": "pkgconfig" },
- { "check": "librsvg-2.0",
-   "checker": "pkgconfig" },
- { "check": "gobject-introspection-1.0",
-   "checker": "pkgconfig" },
- { "check": "pygtk-2.0",
-   "checker": "pkgconfig" },
- { "check": "gconf-2.0",
-   "checker": "pkgconfig" },
- { "check": "pycairo",
-   "checker": "pkgconfig" },
- { "check": "icon-naming-utils",
-   "checker": "pkgconfig" },
- { "check": "gsettings-desktop-schemas",
-   "checker": "pkgconfig" },
- { "check": "libcanberra-gtk",
-   "checker": "pkgconfig" },
- { "check": "tar",
-   "checker": "binary" }]
+[
+    {
+        "check": "aclocal", 
+        "checker": "binary", 
+        "name": "aclocal"
+    }, 
+    {
+        "check": "alsa", 
+        "checker": "pkgconfig", 
+        "name": "alsa"
+    }, 
+    {
+        "check": "autoreconf", 
+        "checker": "binary", 
+        "name": "autoreconf"
+    }, 
+    {
+        "check": "gcc", 
+        "checker": "binary", 
+        "name": "gcc"
+    }, 
+    {
+        "check": "gconf-2.0", 
+        "checker": "pkgconfig", 
+        "name": "gconf-2.0"
+    }, 
+    {
+        "check": "glib-2.0", 
+        "checker": "pkgconfig", 
+        "name": "glib-2.0"
+    }, 
+    {
+        "check": "gnome-doc-common", 
+        "checker": "binary", 
+        "name": "gnome-doc-common"
+    }, 
+    {
+        "check": "gobject-introspection-1.0", 
+        "checker": "pkgconfig", 
+        "name": "gobject-introspection-1.0"
+    }, 
+    {
+        "check": "gsettings-desktop-schemas", 
+        "checker": "pkgconfig", 
+        "name": "gsettings-desktop-schemas"
+    }, 
+    {
+        "check": "gtk+-3.0", 
+        "checker": "pkgconfig", 
+        "name": "gtk+-3.0"
+    }, 
+    {
+        "check": "ice", 
+        "checker": "pkgconfig", 
+        "name": "ice"
+    }, 
+    {
+        "check": "icon-naming-utils", 
+        "checker": "pkgconfig", 
+        "name": "icon-naming-utils"
+    }, 
+    {
+        "check": "icon-slicer", 
+        "checker": "binary", 
+        "name": "icon-slicer"
+    }, 
+    {
+        "check": "intltoolize", 
+        "checker": "binary", 
+        "name": "intltoolize"
+    }, 
+    {
+        "check": "libcanberra-gtk", 
+        "checker": "pkgconfig", 
+        "name": "libcanberra-gtk"
+    }, 
+    {
+        "check": "librsvg-2.0", 
+        "checker": "pkgconfig", 
+        "name": "librsvg-2.0"
+    }, 
+    {
+        "check": "libtool", 
+        "checker": "binary", 
+        "name": "libtool"
+    }, 
+    {
+        "check": "pycairo", 
+        "checker": "pkgconfig", 
+        "name": "pycairo"
+    }, 
+    {
+        "check": "pygtk-2.0", 
+        "checker": "pkgconfig", 
+        "name": "pygtk-2.0"
+    }, 
+    {
+        "check": "python", 
+        "checker": "pkgconfig", 
+        "name": "python"
+    }, 
+    {
+        "check": "sm", 
+        "checker": "pkgconfig", 
+        "name": "sm"
+    }, 
+    {
+        "check": "sphinx-build", 
+        "checker": "binary", 
+        "name": "sphinx-build"
+    }, 
+    {
+        "check": "tar", 
+        "checker": "binary", 
+        "name": "tar"
+    }, 
+    {
+        "check": "xcursorgen", 
+        "checker": "binary", 
+        "name": "xcursorgen"
+    }, 
+    {
+        "check": "xrdb", 
+        "checker": "binary", 
+        "name": "xrdb"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/sugar-buildtime-3.6.json b/config/deps/sugar-buildtime-3.6.json
index a1a5f6b..3c3a0dd 100644
--- a/config/deps/sugar-buildtime-3.6.json
+++ b/config/deps/sugar-buildtime-3.6.json
@@ -1,54 +1,137 @@
-[{ "check": "gcc",
-   "checker": "binary" },
- { "check": "sphinx-build",
-   "checker": "binary" },
- { "check": "autoreconf",
-   "checker": "binary" },
- { "check": "xrdb",
-   "checker": "binary" },
- { "check": "aclocal",
-   "checker": "binary" },
- { "check": "libtool",
-   "checker": "binary" },
- { "check": "icon-slicer",
-   "checker": "binary" },
- { "check": "intltoolize",
-   "checker": "binary" },
- { "check": "xcursorgen",
-   "checker": "binary" },
- { "check": "gnome-doc-common",
-   "checker": "binary" },
- { "check": "python",
-   "checker": "pkgconfig" },
- { "check": "glib-2.0",
-   "checker": "pkgconfig" },
- { "check": "gtk+-3.0",
-   "checker": "pkgconfig" },
- { "check": "sm",
-   "checker": "pkgconfig" },
- { "check": "ice",
-   "checker": "pkgconfig" },
- { "check": "alsa",
-   "checker": "pkgconfig" },
- { "check": "librsvg-2.0",
-   "checker": "pkgconfig" },
- { "check": "gobject-introspection-1.0",
-   "checker": "pkgconfig" },
- { "check": "pygtk-2.0",
-   "checker": "pkgconfig" },
- { "check": "gconf-2.0",
-   "checker": "pkgconfig" },
- { "check": "pycairo",
-   "checker": "pkgconfig" },
- { "check": "gstreamer-1.0",
-   "checker": "pkgconfig" },
- { "check": "gstreamer-plugins-base-1.0",
-   "checker": "pkgconfig" },
- { "check": "icon-naming-utils",
-   "checker": "pkgconfig" },
- { "check": "gsettings-desktop-schemas",
-   "checker": "pkgconfig" },
- { "check": "libcanberra-gtk",
-   "checker": "pkgconfig" },
- { "check": "tar",
-   "checker": "binary"}]
+[
+    {
+        "check": "aclocal", 
+        "checker": "binary", 
+        "name": "aclocal"
+    }, 
+    {
+        "check": "alsa", 
+        "checker": "pkgconfig", 
+        "name": "alsa"
+    }, 
+    {
+        "check": "autoreconf", 
+        "checker": "binary", 
+        "name": "autoreconf"
+    }, 
+    {
+        "check": "gcc", 
+        "checker": "binary", 
+        "name": "gcc"
+    }, 
+    {
+        "check": "gconf-2.0", 
+        "checker": "pkgconfig", 
+        "name": "gconf-2.0"
+    }, 
+    {
+        "check": "glib-2.0", 
+        "checker": "pkgconfig", 
+        "name": "glib-2.0"
+    }, 
+    {
+        "check": "gnome-doc-common", 
+        "checker": "binary", 
+        "name": "gnome-doc-common"
+    }, 
+    {
+        "check": "gobject-introspection-1.0", 
+        "checker": "pkgconfig", 
+        "name": "gobject-introspection-1.0"
+    }, 
+    {
+        "check": "gsettings-desktop-schemas", 
+        "checker": "pkgconfig", 
+        "name": "gsettings-desktop-schemas"
+    }, 
+    {
+        "check": "gstreamer-1.0", 
+        "checker": "pkgconfig", 
+        "name": "gstreamer-1.0"
+    }, 
+    {
+        "check": "gstreamer-plugins-base-1.0", 
+        "checker": "pkgconfig", 
+        "name": "gstreamer-plugins-base-1.0"
+    }, 
+    {
+        "check": "gtk+-3.0", 
+        "checker": "pkgconfig", 
+        "name": "gtk+-3.0"
+    }, 
+    {
+        "check": "ice", 
+        "checker": "pkgconfig", 
+        "name": "ice"
+    }, 
+    {
+        "check": "icon-naming-utils", 
+        "checker": "pkgconfig", 
+        "name": "icon-naming-utils"
+    }, 
+    {
+        "check": "icon-slicer", 
+        "checker": "binary", 
+        "name": "icon-slicer"
+    }, 
+    {
+        "check": "intltoolize", 
+        "checker": "binary", 
+        "name": "intltoolize"
+    }, 
+    {
+        "check": "libcanberra-gtk", 
+        "checker": "pkgconfig", 
+        "name": "libcanberra-gtk"
+    }, 
+    {
+        "check": "librsvg-2.0", 
+        "checker": "pkgconfig", 
+        "name": "librsvg-2.0"
+    }, 
+    {
+        "check": "libtool", 
+        "checker": "binary", 
+        "name": "libtool"
+    }, 
+    {
+        "check": "pycairo", 
+        "checker": "pkgconfig", 
+        "name": "pycairo"
+    }, 
+    {
+        "check": "pygtk-2.0", 
+        "checker": "pkgconfig", 
+        "name": "pygtk-2.0"
+    }, 
+    {
+        "check": "python", 
+        "checker": "pkgconfig", 
+        "name": "python"
+    }, 
+    {
+        "check": "sm", 
+        "checker": "pkgconfig", 
+        "name": "sm"
+    }, 
+    {
+        "check": "sphinx-build", 
+        "checker": "binary", 
+        "name": "sphinx-build"
+    }, 
+    {
+        "check": "tar", 
+        "checker": "binary", 
+        "name": "tar"
+    }, 
+    {
+        "check": "xcursorgen", 
+        "checker": "binary", 
+        "name": "xcursorgen"
+    }, 
+    {
+        "check": "xrdb", 
+        "checker": "binary", 
+        "name": "xrdb"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/sugar-runtime-3.4.json b/config/deps/sugar-runtime-3.4.json
index 53349a4..7baf0ef 100644
--- a/config/deps/sugar-runtime-3.4.json
+++ b/config/deps/sugar-runtime-3.4.json
@@ -1,85 +1,157 @@
-[{ "check": "org.freedesktop.Telepathy.AccountManager",
-   "checker": "dbus" },
- { "check": "dconf",
-   "checker": "binary" },
- { "check": "gnome-keyring-daemon",
-   "checker": "binary" },
- { "check": "metacity",
-   "checker": "binary" },
- { "check": "Adwaita",
-   "checker": "metacity-theme" },
- { "check": "espeak",
-   "checker": "binary" },
- { "check_name": "wnck python",
-   "check": "import wnck",
-   "checker": "python" },
- { "check_name": "gconf python",
-   "check": "import gconf",
-   "checker": "python" },
- { "check_name": "simplejson python",
-   "check": "import simplejson",
-   "checker": "python" },
- { "check_name": "hippo python",
-   "check": "import hippo",
-   "checker": "python" },
- { "check_name": "telepathy python",
-   "check": "import telepathy",
-   "checker": "python" },
- { "check_name": "xapian python",
-   "check": "import xapian",
-   "checker": "python" },
- { "check_name": "dateutil python",
-   "check": "import dateutil",
-   "checker": "python" },
- { "check_name": "gtksourceview2 python",
-   "check": "import gtksourceview2",
-   "checker": "python" },
- { "check_name": "vte python",
-   "check": "import vte",
-   "checker": "python" },
- { "check_name": "decorator python",
-   "check": "import decorator",
-   "checker": "python" },
- { "check_name": "gi python",
-   "check": "import gi",
-   "checker": "python" },
- { "check_name": "evince typelib",
-   "check": "from gi.repository import EvinceDocument",
-   "checker": "python" },
- { "check_name": "gtksource typelib",
-   "check": "from gi.repository import GtkSource",
-   "checker": "python" },
- { "check_name": "gconf typelib",
-   "check": "from gi.repository import GConf",
-   "checker": "python" },
- { "check_name": "gst typelib",
-   "check": "from gi.repository import Gst",
-   "checker": "python" },
- { "check_name": "wnck typelib",
-   "check": "from gi.repository import Wnck",
-   "checker": "python" },
- { "check_name": "rsvg python",
-   "check": "import rsvg",
-   "checker": "python" },
- { "check": "org.freedesktop.Telepathy.ConnectionManager.gabble",
-   "checker": "dbus" },
- { "check": "org.freedesktop.Telepathy.ConnectionManager.salut",
-   "checker": "dbus" },
- { "check_name": "webkit typelib",
-   "check": "from gi.repository import WebKit",
-   "checker": "python" },
- { "check_name": "cairo foreign",
-   "check": "from gi.repository import Gdk, Gtk; window = Gtk.Window(0); window.realize();context = Gdk.cairo_create(window.get_window())",
-   "checker": "python" },
- { "check_name": "pygst python",
-   "check": "import pygst",
-   "checker": "python" },
- { "check_name": "vte typelib",
-   "check": "from gi.repository import Vte",
-   "checker": "python" },
- { "check": "video4linux2",
-   "checker": "gstreamer-0.10" },
- { "check_name": "cairo typelib",
-   "check": "from gi.repository import cairo",
-   "checker": "python" }
-]
+[
+    {
+        "check": "Adwaita", 
+        "checker": "metacity-theme", 
+        "name": "Adwaita"
+    }, 
+    {
+        "check": "from gi.repository import Gdk, Gtk; window = Gtk.Window(0); window.realize();context = Gdk.cairo_create(window.get_window())", 
+        "checker": "python", 
+        "name": "cairo foreign"
+    }, 
+    {
+        "check": "from gi.repository import cairo", 
+        "checker": "python", 
+        "name": "cairo typelib"
+    }, 
+    {
+        "check": "import dateutil", 
+        "checker": "python", 
+        "name": "dateutil python"
+    }, 
+    {
+        "check": "dconf", 
+        "checker": "binary", 
+        "name": "dconf"
+    }, 
+    {
+        "check": "import decorator", 
+        "checker": "python", 
+        "name": "decorator python"
+    }, 
+    {
+        "check": "espeak", 
+        "checker": "binary", 
+        "name": "espeak"
+    }, 
+    {
+        "check": "from gi.repository import EvinceDocument", 
+        "checker": "python", 
+        "name": "evince typelib"
+    }, 
+    {
+        "check": "import gconf", 
+        "checker": "python", 
+        "name": "gconf python"
+    }, 
+    {
+        "check": "from gi.repository import GConf", 
+        "checker": "python", 
+        "name": "gconf typelib"
+    }, 
+    {
+        "check": "import gi", 
+        "checker": "python", 
+        "name": "gi python"
+    }, 
+    {
+        "check": "gnome-keyring-daemon", 
+        "checker": "binary", 
+        "name": "gnome-keyring-daemon"
+    }, 
+    {
+        "check": "from gi.repository import Gst", 
+        "checker": "python", 
+        "name": "gst typelib"
+    }, 
+    {
+        "check": "from gi.repository import GtkSource", 
+        "checker": "python", 
+        "name": "gtksource typelib"
+    }, 
+    {
+        "check": "import gtksourceview2", 
+        "checker": "python", 
+        "name": "gtksourceview2 python"
+    }, 
+    {
+        "check": "import hippo", 
+        "checker": "python", 
+        "name": "hippo python"
+    }, 
+    {
+        "check": "metacity", 
+        "checker": "binary", 
+        "name": "metacity"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.AccountManager", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.AccountManager"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.ConnectionManager.gabble", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.ConnectionManager.gabble"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.ConnectionManager.salut", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.ConnectionManager.salut"
+    }, 
+    {
+        "check": "import pygst", 
+        "checker": "python", 
+        "name": "pygst python"
+    }, 
+    {
+        "check": "import rsvg", 
+        "checker": "python", 
+        "name": "rsvg python"
+    }, 
+    {
+        "check": "import simplejson", 
+        "checker": "python", 
+        "name": "simplejson python"
+    }, 
+    {
+        "check": "import telepathy", 
+        "checker": "python", 
+        "name": "telepathy python"
+    }, 
+    {
+        "check": "video4linux2", 
+        "checker": "gstreamer-0.10", 
+        "name": "video4linux2"
+    }, 
+    {
+        "check": "import vte", 
+        "checker": "python", 
+        "name": "vte python"
+    }, 
+    {
+        "check": "from gi.repository import Vte", 
+        "checker": "python", 
+        "name": "vte typelib"
+    }, 
+    {
+        "check": "from gi.repository import WebKit", 
+        "checker": "python", 
+        "name": "webkit typelib"
+    }, 
+    {
+        "check": "import wnck", 
+        "checker": "python", 
+        "name": "wnck python"
+    }, 
+    {
+        "check": "from gi.repository import Wnck", 
+        "checker": "python", 
+        "name": "wnck typelib"
+    }, 
+    {
+        "check": "import xapian", 
+        "checker": "python", 
+        "name": "xapian python"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/sugar-runtime-3.6.json b/config/deps/sugar-runtime-3.6.json
index 05bf072..21dab06 100644
--- a/config/deps/sugar-runtime-3.6.json
+++ b/config/deps/sugar-runtime-3.6.json
@@ -1,94 +1,172 @@
-[{ "check": "org.freedesktop.Telepathy.AccountManager",
-   "checker": "dbus" },
- { "check": "dconf",
-   "checker": "binary" },
- { "check": "gnome-keyring-daemon",
-   "checker": "binary" },
- { "check": "metacity",
-   "checker": "binary" },
- { "check": "Adwaita",
-   "checker": "metacity-theme" },
- { "check": "espeak",
-   "checker": "binary" },
- { "check_name": "gconf python",
-   "check": "import gconf",
-   "checker": "python" },
- { "check_name": "wnck python",
-   "check": "import wnck",
-   "checker": "python" },
- { "check_name": "simplejson python",
-   "check": "import simplejson",
-   "checker": "python" },
- { "check_name": "hippo python",
-   "check": "import hippo",
-   "checker": "python" },
- { "check_name": "telepathy python",
-   "check": "import telepathy",
-   "checker": "python" },
- { "check_name": "xapian python",
-   "check": "import xapian",
-   "checker": "python" },
- { "check_name": "dateutil python",
-   "check": "import dateutil",
-   "checker": "python" },
- { "check_name": "gtksourceview2 python",
-   "check": "import gtksourceview2",
-   "checker": "python" },
- { "check_name": "vte python",
-   "check": "import vte",
-   "checker": "python" },
- { "check_name": "decorator python",
-   "check": "import decorator",
-   "checker": "python" },
- { "check_name": "gi python",
-   "check": "import gi",
-   "checker": "python" },
- { "check_name": "evince typelib",
-   "check": "from gi.repository import EvinceDocument",
-   "checker": "python" },
- { "check_name": "gtksource typelib",
-   "check": "from gi.repository import GtkSource",
-   "checker": "python" },
- { "check_name": "gconf typelib",
-   "check": "from gi.repository import GConf",
-   "checker": "python" },
- { "check_name": "gst typelib",
-   "check": "import gi; gi.require_version('Gst', '1.0'); from gi.repository import Gst; Gst.init([])",
-   "checker": "python" },
- { "check_name": "wnck typelib",
-   "check": "from gi.repository import Wnck",
-   "checker": "python" },
- { "check_name": "rsvg python",
-   "check": "import rsvg",
-   "checker": "python" },
- { "check": "org.freedesktop.Telepathy.ConnectionManager.gabble",
-   "checker": "dbus" },
- { "check": "org.freedesktop.Telepathy.ConnectionManager.salut",
-   "checker": "dbus" },
- { "check_name": "webkit typelib",
-   "check": "from gi.repository import WebKit",
-   "checker": "python" },
- { "check_name": "cairo foreign",
-   "check": "from gi.repository import Gdk, Gtk; window = Gtk.Window(0); window.realize();context = Gdk.cairo_create(window.get_window())",
-   "checker": "python" },
- { "check_name": "pygst python",
-   "check": "import pygst",
-   "checker": "python" },
- { "check_name": "vte typelib",
-   "check": "from gi.repository import Vte",
-   "checker": "python" },
- { "check": "video4linux2",
-   "checker": "gstreamer-0.10" },
- { "check_name": "playback gstreamer",
-   "check": "playback",
-   "checker": "gstreamer-1.0" },
- { "check_name": "pango gstreamer",
-   "check": "pango",
-   "checker": "gstreamer-1.0" },
- { "check_name": "autodetect gstreamer",
-   "check": "autodetect",
-   "checker": "gstreamer-1.0" },
- { "check_name": "cairo typelib",
-   "check": "from gi.repository import cairo",
-   "checker": "python" }
-]
+[
+    {
+        "check": "Adwaita", 
+        "checker": "metacity-theme", 
+        "name": "Adwaita"
+    }, 
+    {
+        "check": "autodetect", 
+        "checker": "gstreamer-1.0", 
+        "name": "autodetect gstreamer"
+    }, 
+    {
+        "check": "from gi.repository import Gdk, Gtk; window = Gtk.Window(0); window.realize();context = Gdk.cairo_create(window.get_window())", 
+        "checker": "python", 
+        "name": "cairo foreign"
+    }, 
+    {
+        "check": "from gi.repository import cairo", 
+        "checker": "python", 
+        "name": "cairo typelib"
+    }, 
+    {
+        "check": "import dateutil", 
+        "checker": "python", 
+        "name": "dateutil python"
+    }, 
+    {
+        "check": "dconf", 
+        "checker": "binary", 
+        "name": "dconf"
+    }, 
+    {
+        "check": "import decorator", 
+        "checker": "python", 
+        "name": "decorator python"
+    }, 
+    {
+        "check": "espeak", 
+        "checker": "binary", 
+        "name": "espeak"
+    }, 
+    {
+        "check": "from gi.repository import EvinceDocument", 
+        "checker": "python", 
+        "name": "evince typelib"
+    }, 
+    {
+        "check": "import gconf", 
+        "checker": "python", 
+        "name": "gconf python"
+    }, 
+    {
+        "check": "from gi.repository import GConf", 
+        "checker": "python", 
+        "name": "gconf typelib"
+    }, 
+    {
+        "check": "import gi", 
+        "checker": "python", 
+        "name": "gi python"
+    }, 
+    {
+        "check": "gnome-keyring-daemon", 
+        "checker": "binary", 
+        "name": "gnome-keyring-daemon"
+    }, 
+    {
+        "check": "import gi; gi.require_version('Gst', '1.0'); from gi.repository import Gst; Gst.init([])", 
+        "checker": "python", 
+        "name": "gst typelib"
+    }, 
+    {
+        "check": "from gi.repository import GtkSource", 
+        "checker": "python", 
+        "name": "gtksource typelib"
+    }, 
+    {
+        "check": "import gtksourceview2", 
+        "checker": "python", 
+        "name": "gtksourceview2 python"
+    }, 
+    {
+        "check": "import hippo", 
+        "checker": "python", 
+        "name": "hippo python"
+    }, 
+    {
+        "check": "metacity", 
+        "checker": "binary", 
+        "name": "metacity"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.AccountManager", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.AccountManager"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.ConnectionManager.gabble", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.ConnectionManager.gabble"
+    }, 
+    {
+        "check": "org.freedesktop.Telepathy.ConnectionManager.salut", 
+        "checker": "dbus", 
+        "name": "org.freedesktop.Telepathy.ConnectionManager.salut"
+    }, 
+    {
+        "check": "pango", 
+        "checker": "gstreamer-1.0", 
+        "name": "pango gstreamer"
+    }, 
+    {
+        "check": "playback", 
+        "checker": "gstreamer-1.0", 
+        "name": "playback gstreamer"
+    }, 
+    {
+        "check": "import pygst", 
+        "checker": "python", 
+        "name": "pygst python"
+    }, 
+    {
+        "check": "import rsvg", 
+        "checker": "python", 
+        "name": "rsvg python"
+    }, 
+    {
+        "check": "import simplejson", 
+        "checker": "python", 
+        "name": "simplejson python"
+    }, 
+    {
+        "check": "import telepathy", 
+        "checker": "python", 
+        "name": "telepathy python"
+    }, 
+    {
+        "check": "video4linux2", 
+        "checker": "gstreamer-0.10", 
+        "name": "video4linux2"
+    }, 
+    {
+        "check": "import vte", 
+        "checker": "python", 
+        "name": "vte python"
+    }, 
+    {
+        "check": "from gi.repository import Vte", 
+        "checker": "python", 
+        "name": "vte typelib"
+    }, 
+    {
+        "check": "from gi.repository import WebKit", 
+        "checker": "python", 
+        "name": "webkit typelib"
+    }, 
+    {
+        "check": "import wnck", 
+        "checker": "python", 
+        "name": "wnck python"
+    }, 
+    {
+        "check": "from gi.repository import Wnck", 
+        "checker": "python", 
+        "name": "wnck typelib"
+    }, 
+    {
+        "check": "import xapian", 
+        "checker": "python", 
+        "name": "xapian python"
+    }
+]
\ No newline at end of file
diff --git a/config/deps/system.json b/config/deps/system.json
index f9f70b3..5369c95 100644
--- a/config/deps/system.json
+++ b/config/deps/system.json
@@ -1,23 +1,57 @@
-[{ "check": "c++",
-   "checker": "binary" },
- { "check": "yasm",
-   "checker": "binary" },
- { "check": "flex",
-   "checker": "binary" },
- { "check": "xtst",
-   "checker": "pkgconfig" },
- { "check": "bison",
-   "checker": "binary" },
- { "check": "gtk-doc",
-   "checker": "pkgconfig" },
- { "check": "cairo-gobject",
-   "checker": "pkgconfig" },
- { "check": "iso-codes",
-   "checker": "pkgconfig" },
- { "check": "xkbfile",
-   "checker": "pkgconfig" },
- { "check_name": "espeak devel",
-   "check": "espeak/speak_lib.h",
-   "checker": "include" },
- { "check": "libxml-2.0",
-   "checker": "pkgconfig" }]
+[
+    {
+        "check": "bison", 
+        "checker": "binary", 
+        "name": "bison"
+    }, 
+    {
+        "check": "c++", 
+        "checker": "binary", 
+        "name": "c++"
+    }, 
+    {
+        "check": "cairo-gobject", 
+        "checker": "pkgconfig", 
+        "name": "cairo-gobject"
+    }, 
+    {
+        "check": "espeak/speak_lib.h", 
+        "checker": "include", 
+        "name": "espeak devel"
+    }, 
+    {
+        "check": "flex", 
+        "checker": "binary", 
+        "name": "flex"
+    }, 
+    {
+        "check": "gtk-doc", 
+        "checker": "pkgconfig", 
+        "name": "gtk-doc"
+    }, 
+    {
+        "check": "iso-codes", 
+        "checker": "pkgconfig", 
+        "name": "iso-codes"
+    }, 
+    {
+        "check": "libxml-2.0", 
+        "checker": "pkgconfig", 
+        "name": "libxml-2.0"
+    }, 
+    {
+        "check": "xkbfile", 
+        "checker": "pkgconfig", 
+        "name": "xkbfile"
+    }, 
+    {
+        "check": "xtst", 
+        "checker": "pkgconfig", 
+        "name": "xtst"
+    }, 
+    {
+        "check": "yasm", 
+        "checker": "binary", 
+        "name": "yasm"
+    }
+]
\ No newline at end of file
--
cgit v0.9.1