[jhbuild] core-3.16: Use appstream-glib rather than appdata-tool

[Richard Hughes <rhughes src gnome org>]

commit fc26797762e8ce599098c93f590f1836a7398635
Author: Richard Hughes <richard hughsie com>
Date:   Thu Oct 30 19:49:34 2014 +0000

    core-3.16: Use appstream-glib rather than appdata-tool
    
    The former is providing the old binary for a short time.

 modulesets/gnome-suites-core-3.16.modules      |    4 ++--
 modulesets/gnome-suites-core-deps-3.16.modules |   21 ---------------------
 modulesets/gnome-world.modules                 |    2 +-
 3 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index 53f1c3f..b6f4bca 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -743,7 +743,7 @@
       <dep package="vte"/>
       <dep package="yelp-tools"/>
       <dep package="nautilus"/>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
     </dependencies>
     <suggests>
       <dep package="gnome-shell"/>
@@ -806,7 +806,7 @@
   <autotools id="totem">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="cairo"/>
       <dep package="clutter"/>
       <dep package="clutter-gst"/>
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 44d27eb..697255a 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -73,27 +73,6 @@
 
 <!-- Build dependencies of gnome-suites-core -->
 
-  <autotools id="appdata-tools">
-    <branch repo="people.freedesktop.org"
-            module="~hughsient/releases/appdata-tools-${version}.tar.xz"
-            version="0.1.8"
-            hash="sha256:401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461"
-            size="251320"/>
-<!--
-    <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
--->
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="glib-networking"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-    </suggests>
-  </autotools>
-
   <autotools id="cairo" autogenargs="--enable-gl">
     <branch repo="git.freedesktop.org">
     </branch>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index c95f729..7e2a6b9 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -149,7 +149,7 @@
   <autotools id="easytag">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>