From 1b42be673b2cd237ce873df9f4b0b339aab9518a Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 29 Nov 2012 17:15:35 +0000
Subject: Merge system-3.4 and 3.6

---
(limited to 'config/packages')

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"
--
cgit v0.9.1