[jhbuild] Revert "3.6: Several modules are not ported to gstreamer 0.11 yet"

[Frederic Peters <fpeters src gnome org>]

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

    Revert "3.6: Several modules are not ported to gstreamer 0.11 yet"
    
    This reverts commit 1396bdb2fab14ef7f23c80c5e7156f7cf2a9711f.

 modulesets/gnome-suites-core-3.6.modules      |   18 +++++++++---------
 modulesets/gnome-suites-core-deps-3.6.modules |   10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 9a55874..1803c9b 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -146,7 +146,7 @@
     <suggests>
       <!-- <dep package="cups"/> -->
       <dep package="accountsservice"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="NetworkManager"/>
     </suggests>
   </autotools>
@@ -299,7 +299,7 @@
     </dependencies>
     <suggests>
       <!-- <dep package="cups"/> -->
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
     </suggests>
   </autotools>
 
@@ -335,7 +335,7 @@
       <dep package="gcr"/>
     </dependencies>
     <suggests>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </suggests>
     <after>
@@ -554,7 +554,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="gnutls"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
       <dep package="libsoup"/>
@@ -791,8 +791,8 @@
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
       <dep package="WebKit"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
@@ -802,9 +802,9 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gst-plugins-good-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
       <dep package="iso-codes"/>
       <dep package="totem-pl-parser"/>
       <dep package="libpeas"/>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index e84f4e8..c816962 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -274,8 +274,8 @@
     <branch/>
     <dependencies>
       <dep package="clutter"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
@@ -349,7 +349,7 @@
   <autotools id="gnome-video-effects">
     <branch/>
     <dependencies>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
     </dependencies>
   </autotools>
 
@@ -880,7 +880,7 @@
     </dependencies>
     <suggests>
       <dep package="libgnome-keyring"/>
-      <dep package="gstreamer-0.10"/>
+      <dep package="gstreamer"/>
       <dep package="nautilus"/>
       <dep package="NetworkManager"/>
       <dep package="evolution"/>
@@ -900,7 +900,7 @@
   </autotools>
 
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --enable-webkit2 --with-gstreamer=0.11">
+             autogenargs="--enable-introspection --enable-webkit2">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
             module="webkit-1.8.0.tar.xz"