[jhbuild] apps-3.[4|6]: Update abiword dependencies

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

commit d8ef4451749a98c98bdb6f7f07cbcc6f094c17be
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Mar 28 20:29:32 2012 +0100

    apps-3.[4|6]: Update abiword dependencies

 modulesets/gnome-apps-3.4.modules |    5 +++--
 modulesets/gnome-apps-3.6.modules |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.4.modules b/modulesets/gnome-apps-3.4.modules
index 662b01b..1273683 100644
--- a/modulesets/gnome-apps-3.4.modules
+++ b/modulesets/gnome-apps-3.4.modules
@@ -535,15 +535,16 @@
   <autotools id="abiword">
     <branch repo="svn.abisource.com"/>
     <dependencies>
+      <dep package="cairo"/>
       <dep package="glib"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libgsf"/>
       <dep package="wv"/>
     </dependencies>
     <suggests>
       <dep package="enchant"/>
-      <dep package="gnome-vfs"/>
+      <dep package="libgoffice"/>
       <dep package="gucharmap"/>
     </suggests>
   </autotools>
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index ab13662..5e05e14 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -524,15 +524,16 @@
   <autotools id="abiword">
     <branch repo="svn.abisource.com"/>
     <dependencies>
+      <dep package="cairo"/>
       <dep package="glib"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libgsf"/>
       <dep package="wv"/>
     </dependencies>
     <suggests>
       <dep package="enchant"/>
-      <dep package="gnome-vfs"/>
+      <dep package="goffice"/>
       <dep package="gucharmap"/>
     </suggests>
   </autotools>