[jhbuild] 3.8: Use gypsy from distro packages

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

commit 716457d14428c995e3ea8a6d178dbe60ba9bdc46
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Jan 4 18:02:29 2013 +0000

    3.8: Use gypsy from distro packages

 modulesets/gnome-suites-core-deps-3.8.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.8.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 3f4cb41..b78b89f 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -36,8 +36,6 @@
     href="http://freedesktop.org/software/"/>
 <repository type="tarball" name="people.freedesktop.org"
     href="http://people.freedesktop.org/"/>
-<repository type="tarball" name="gypsy.freedesktop.org"
-    href="http://gypsy.freedesktop.org/releases/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="libopenraw.freedesktop.org"
@@ -69,20 +67,6 @@
 
 <!-- Build dependencies of gnome-suites-core -->
 
-  <!-- https://bugs.freedesktop.org/show_bug.cgi?id=56852 -->
-  <autotools id="gypsy" autogenargs="CFLAGS=-Wno-error=deprecated-declarations">
-    <branch repo="gypsy.freedesktop.org"
-            module="gypsy-${version}.tar.bz2"
-            version="0.9"
-            hash="sha256:4348bb4168c24be681a48443e4d98fd73935988ed5910693944e97ff0d8cfe58"/>
-    <dependencies>
-      <dep package="bluez"/>
-      <dep package="dbus-glib"/>
-      <dep package="gudev"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="geoclue">
     <branch repo="git.freedesktop.org"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index e38ebce..2ee5f6e 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -199,6 +199,12 @@
     <branch repo="system" version="173"/>
   </systemmodule>
 
+  <systemmodule id="gypsy">
+    <pkg-config>gypsy.pc</pkg-config>
+    <branch repo="system"
+            version="0.8"/>
+  </systemmodule>
+
   <systemmodule id="highlight">
     <branch repo="system"/>
     <systemdependencies>