[jhbuild] Revert "deps-3.6: gstreamer has been branched"

[Frederic Peters <fpeters src gnome org>]

commit d649f1a63801d4bfe853a4f5165b18b88c167141
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Fri Apr 13 08:35:51 2012 +0200

    Revert "deps-3.6: gstreamer has been branched"
    
    This reverts commit f1aae45938f7d59e52cb62a038c9bc76b9c4096b.

 modulesets/gnome-suites-core-3.6.modules      |    2 +-
 modulesets/gnome-suites-core-deps-3.6.modules |   40 -------------------------
 2 files changed, 1 insertions(+), 41 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 1803c9b..b25e6a0 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -525,7 +525,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-base"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
       <dep package="libxml2"/>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index c816962..9067dde 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -391,46 +391,6 @@
     </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"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gobject-introspection"/>
-    </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">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-base"
-            revision="0.10"/>
-    <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gtk+"/>
-      <dep package="liboil"/>
-    </dependencies>
-    <suggests>
-      <dep package="gudev"/>
-    </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">
-    <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"/>
-    </dependencies>
-    <suggests>
-      <dep package="pulseaudio"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
-    </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"/>
     <dependencies>