[jhbuild] 3.10: Move libcanberra to -sysdeps

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

commit 89a0429ab3b330bfbed7940752753fc1377d02a6
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 10 16:39:05 2013 +0200

    3.10: Move libcanberra to -sysdeps

 modulesets/gnome-suites-core-deps-3.10.modules |   21 ---------------------
 modulesets/gnome-sysdeps-3.10.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 94ef7a3..e0fd8ab 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -26,8 +26,6 @@
     href="git://linuxwacom.git.sourceforge.net/"/>
 
 <!-- tarball repos -->
-<repository type="tarball" name="0pointer.de"
-    href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="github.com/metabrainz"
@@ -156,25 +154,6 @@
     </branch>
   </autotools>
 
-  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>libcanberra-gtk.pc</pkg-config>
-    <branch repo="0pointer.de"
-            module="libcanberra/libcanberra-${version}.tar.xz"
-            version="0.30"
-            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
-    </branch>
-    <dependencies>
-      <dep package="gtk-doc"/>
-      <dep package="libvorbis"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gtk+-2"/>
-      <dep package="pulseaudio"/>
-      <dep package="gstreamer"/>
-    </after>
-  </autotools>
-
   <autotools id="libgdata">
     <pkg-config>libgdata.pc</pkg-config>
     <branch/>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 96845bc..be01c09 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -353,6 +353,12 @@
     <branch repo="system" version="2.8.0"/>
   </systemmodule>
 
+  <systemmodule id="libcanberra">
+    <pkg-config>libcanberra.pc</pkg-config>
+    <branch repo="system"
+            version="0.30"/>
+  </systemmodule>
+
   <systemmodule id="libdb">
     <branch repo="system"/>
     <systemdependencies>