Merge system-3.4 and 3.6

3 files changed, 28 insertions, 51 deletions

diff --git a/config/modules/system-3.6.json b/config/modules/system-3.6.json
deleted file mode 100644
index 6129135..0000000
--- a/config/modules/system-3.6.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-    {
-        "branch": "2.34.2", 
-        "name": "glib", 
-        "options": [
-            "--disable-modular-tests"
-        ], 
-        "repo": "git://git.gnome.org/glib"
-    }, 
-    {
-        "branch": "GOBJECT_INTROSPECTION_1_34_1_1", 
-        "name": "gobject-introspection", 
-        "options": [
-            "--disable-tests"
-        ], 
-        "repo": "git://git.gnome.org/gobject-introspection"
-    }, 
-    {
-        "branch": "776088b4d673183264893cf40bd3e4e359ba7a5", 
-        "name": "pygobject", 
-        "repo": "git://git.gnome.org/pygobject"
-    }, 
-    {
-        "branch": "METACITY_2_34_13", 
-        "name": "metacity", 
-        "options": [
-            "--disable-themes-documentation"
-        ], 
-        "repo": "git://git.gnome.org/metacity"
-    }
-]
diff --git a/config/modules/system-3.4.json b/config/modules/system.json
index 3804470..2f3b73f 100644
--- a/config/modules/system-3.4.json
+++ b/config/modules/system.json
@@ -22,26 +22,31 @@
     }, 
     {
         "branch": "ATK_2_6_0", 
+        "if": "gnome_version == '3.4'", 
         "name": "atk", 
         "repo": "git://git.gnome.org/atk"
     }, 
     {
         "branch": "AT_SPI2_CORE_2_6_1", 
+        "if": "gnome_version == '3.4'", 
         "name": "at-spi2-core", 
         "repo": "git://git.gnome.org/at-spi2-core"
     }, 
     {
         "branch": "AT_SPI2_ATK_2_6_1", 
+        "if": "gnome_version == '3.4'", 
         "name": "at-spi2-atk", 
         "repo": "git://git.gnome.org/at-spi2-atk"
     }, 
     {
         "branch": "3.6.1", 
+        "if": "gnome_version == '3.4'", 
         "name": "gtk+", 
         "repo": "git://git.gnome.org/gtk+"
     }, 
     {
         "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
         "name": "gstreamer", 
         "options": [
             "--disable-gtk-doc"
@@ -51,6 +56,7 @@
     }, 
     {
         "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
         "name": "gst-plugins-base", 
         "options": [
             "--disable-gtk-doc"
@@ -60,6 +66,7 @@
     }, 
     {
         "branch": "1.0.2", 
+        "if": "gstreamer_version != '1.0'", 
         "name": "gst-plugins-good", 
         "options": [
             "--disable-gtk-doc"
@@ -69,6 +76,7 @@
     }, 
     {
         "branch": "libxklavier-5.3", 
+        "if": "gnome_version == '3.4'", 
         "name": "libxklavier", 
         "repo": "git://anongit.freedesktop.org/libxklavier"
     }, 
diff --git a/config/packages/deps.json b/config/packages/deps.json
index 6a72773..47d66c7 100644
--- a/config/packages/deps.json
+++ b/config/packages/deps.json
@@ -82,19 +82,19 @@
         ], 
         "fedora": [
             "at-spi2-core"
-        ],
+        ], 
         "ubuntu": [
             "gir1.2-atspi-2.0"
         ]
-    },
+    }, 
     "autodetect gstreamer": {
         "fedora": [
             "gstreamer1-plugins-good"
-        ],
+        ], 
         "ubuntu": [
             "gstreamer1.0-plugins-good"
         ]
-    },
+    }, 
     "autoreconf": {
         "debian": [
             "autoconf"
@@ -375,22 +375,22 @@
             "gstreamer"
         ], 
         "ubuntu": [
-            "gir1.2-gstreamer-1.0",
+            "gir1.2-gstreamer-1.0", 
             "libgstreamer1.0-0"
         ]
-    },
+    }, 
     "gstreamer-1.0": {
         "fedora": [
             "gstreamer1-devel"
-        ],
+        ], 
         "ubuntu": [
             "libgstreamer1.0-dev"
         ]
-    },
+    }, 
     "gstreamer-plugins-base-1.0": {
         "fedora": [
             "gstreamer1-plugins-base-devel"
-        ],
+        ], 
         "ubuntu": [
             "libgstreamer-plugins-base1.0-dev"
         ]
@@ -592,23 +592,15 @@
         "ubuntu": [
             "telepathy-salut"
         ]
-    },
+    }, 
     "pango gstreamer": {
         "fedora": [
             "gstreamer1-plugins-base"
-        ],
+        ], 
         "ubuntu": [
             "gstreamer1.0-x"
         ]
-    },
-    "playback gstreamer": {
-        "fedora": [
-            "gstreamer1-plugins-base"
-        ],
-        "ubuntu": [
-            "gstreamer1.0-plugins-base"
-        ]
-    },
+    }, 
     "pkg-config": {
         "debian": [
             "pkg-config"
@@ -620,6 +612,14 @@
             "pkgconfig"
         ]
     }, 
+    "playback gstreamer": {
+        "fedora": [
+            "gstreamer1-plugins-base"
+        ], 
+        "ubuntu": [
+            "gstreamer1.0-plugins-base"
+        ]
+    }, 
     "pycairo": {
         "debian": [
             "python-cairo-dev"