[jhbuild] 3.10: Move pulseaudio to -sysdeps

[Javier Jardón <jjardon src gnome org>]

commit cbba529744c1f6492fa3467171a1c3a6d7f009c7
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 10 14:44:16 2013 +0200

    3.10: Move pulseaudio to -sysdeps

 modulesets/gnome-suites-core-3.10.modules |   26 -----------------
 modulesets/gnome-sysdeps-3.10.modules     |   43 ++++-------------------------
 2 files changed, 6 insertions(+), 63 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 06129ec..ed062a9 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -422,32 +422,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="pulseaudio"
-             autogenargs="--disable-hal --disable-oss">
-    <pkg-config>libpulse.pc</pkg-config>
-    <branch repo="freedesktop.org"
-            module="software/pulseaudio/releases/pulseaudio-${version}.tar.xz"
-            version="2.1"
-            hash="sha256:ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f"/>
-    <dependencies>
-      <dep package="alsa"/>
-      <dep package="json"/>
-      <dep package="libsndfile"/>
-      <dep package="libtool-ltdl"/>
-      <dep package="libudev"/>
-      <dep package="glib"/>
-      <dep package="speex"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="bluez"/>
-      <dep package="dbus"/>
-    </suggests>
-    <after>
-      <dep package="polkit"/>
-    </after>
-  </autotools>
-
   <autotools id="telepathy-mission-control" autogenargs="--disable-Werror">
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 75dd2d1..96845bc 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -9,12 +9,6 @@
 
   <repository type="system" name="system"/>
 
-  <systemmodule id="alsa">
-    <pkg-config>alsa.pc</pkg-config>
-    <branch repo="system"
-            version="1.0.19"/>
-  </systemmodule>
-
   <systemmodule id="avahi">
     <pkg-config>avahi-gobject.pc</pkg-config>
     <branch repo="system"
@@ -268,12 +262,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="json">
-    <pkg-config>json.pc</pkg-config>
-    <branch repo="system"
-            version="0.9"/>
-  </systemmodule>
-
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -442,12 +430,6 @@
     <branch repo="system" version="0.4.0"/>
   </systemmodule>
 
-  <systemmodule id="libsndfile">
-    <pkg-config>sndfile.pc</pkg-config>
-    <branch repo="system"
-            version="1.0.21"/>
-  </systemmodule>
-
   <systemmodule id="libtasn1">
     <pkg-config>libtasn1.pc</pkg-config>
     <branch repo="system"
@@ -461,19 +443,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="libtool-ltdl">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="ltdl.h"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="libudev">
-    <pkg-config>libudev.pc</pkg-config>
-    <branch repo="system"
-            version="173"/>
-  </systemmodule>
-
   <systemmodule id="libunistring">
     <branch repo="system"/>
     <systemdependencies>
@@ -591,6 +560,12 @@
             version="0.20"/>
   </systemmodule>
 
+  <systemmodule id="pulseaudio">
+    <pkg-config>libpulse-mainloop-glib.pc</pkg-config>
+    <branch repo="system"
+            version="2.1"/>
+  </systemmodule>
+
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>
@@ -666,12 +641,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="speex">
-    <pkg-config>speex.pc</pkg-config>
-    <branch repo="system"
-            version="1.2rc1"/>
-  </systemmodule>
-
   <systemmodule id="sqlite3">
     <pkg-config>sqlite3.pc</pkg-config>
     <branch repo="system"