From e7a33e537d1ea5432cdc17aadfb07f33efd7037f Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 01 Aug 2012 19:23:51 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

Conflicts:
	Makefile
	scripts/system.modules
---
(limited to 'scripts')

diff --git a/scripts/check-system b/scripts/check-system
index 0d35478..6dcad8e 100755
--- a/scripts/check-system
+++ b/scripts/check-system
@@ -255,9 +255,17 @@ checks = \
    "checker": "gstreamer",
    "packages": { "fedora": "gstreamer-plugins-good",
                  "ubuntu": "gstreamer0.10-plugins-good" } },
+ { "check": "import abiword",
+   "checker": "python",
+   "packages": { "fedora": "pyabiword",
+                 "ubuntu": None } },
 
  # System modules buildtime
 
+ { "check": "c++",
+   "checker": "binary",
+   "packages": { "fedora": "gcc-c++",
+                 "ubuntu": "g++" } },
  { "check": "flex",
    "checker": "binary",
    "packages": { "fedora": "flex",
diff --git a/scripts/system.modules b/scripts/system.modules
index b350f28..eea3521 100644
--- a/scripts/system.modules
+++ b/scripts/system.modules
@@ -3,6 +3,7 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" href="git://git.gnome.org"/>
   <repository type="git" name="github.com/dnarvaez" href="git://github.com/dnarvaez"/>
+  <repository type="git" name="gstreamer.freedesktop.org" href="git://anongit.freedesktop.org/gstreamer/"/>
   <autotools id="gtk+">
     <branch repo="git.gnome.org"/>
     <dependencies>
@@ -42,11 +43,27 @@
   <autotools id="glib">
     <branch repo="git.gnome.org" revision="3e706ef88b3b433f777e552c85339b901314deaa"/>
   </autotools>
+  <autotools id="gstreamer" revision="8d9a4b2e94fa806f5146482fb0261d890db38fd5" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"/>
+  </autotools>
+  <autotools id="gst-plugins-base" revision="39aa4dc674291f438606ccab6033225f7a886de4" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+    </dependencies>
+  </autotools>
+  <autotools id="gst-plugins-good" revision="86c236a5f61725dc4e0fe22ba6681795bb5f1160" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"/>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
 
   <metamodule id="meta-system">
     <dependencies>
       <dep package="pygobject"/>
       <dep package="gtk+"/>
+      <dep package="gst-plugins-good"/>
     </dependencies>
   </metamodule>
 </moduleset>
--
cgit v0.9.1