[jhbuild] 3.6: Add libgweather-3-4 so development can continue in master

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

commit ece220c301cae6f22b9e6be9e50d59aac61ac65c
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue May 15 12:23:08 2012 +0900

    3.6: Add libgweather-3-4 so development can continue in master

 modulesets/gnome-apps-3.6.modules             |    6 +++---
 modulesets/gnome-suites-core-3.6.modules      |    8 +++++---
 modulesets/gnome-suites-core-deps-3.6.modules |   12 ++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 5b48853..cf9d59c 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -140,7 +140,7 @@
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gucharmap"/>
-      <dep package="libgweather"/>
+      <dep package="libgweather-3-4"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
       <dep package="glib"/>
@@ -906,7 +906,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-pst-import --disable-weather">
+  <autotools id="evolution" autogenargs="--disable-pst-import">
     <branch/>
     <dependencies>
       <dep package="evolution-data-server"/>
@@ -921,7 +921,7 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libgdata"/>
-      <dep package="libgweather"/>
+      <dep package="libgweather-3-4"/>
       <dep package="libical"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
diff --git a/modulesets/gnome-suites-core-3.6.modules b/modulesets/gnome-suites-core-3.6.modules
index 5b1a48d..77f93c7 100644
--- a/modulesets/gnome-suites-core-3.6.modules
+++ b/modulesets/gnome-suites-core-3.6.modules
@@ -63,7 +63,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server" supports-non-srcdir-builds="no" autogenargs="--enable-vala-bindings --disable-weather">
+  <autotools id="evolution-data-server"
+             supports-non-srcdir-builds="no"
+             autogenargs="--enable-vala-bindings">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -72,7 +74,7 @@
       <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="sqlite3"/>
-      <dep package="libgweather"/>
+      <dep package="libgweather-3-4"/>
       <dep package="libical"/>
       <dep package="libgdata"/>
       <dep package="gnome-online-accounts"/>
@@ -461,7 +463,7 @@
       <dep package="gnome-doc-utils"/>
       <dep package="dbus-glib"/>
       <dep package="librsvg"/>
-      <dep package="libgweather"/>
+      <dep package="libgweather-3-4"/>
       <dep package="libcanberra"/>
     </dependencies>
     <suggests>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index a846a0b..e94db3b 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -569,10 +569,22 @@
   </autotools>
 
   <autotools id="libgweather">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgweather-3-4">
     <branch revision="gnome-3-4"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
+      <dep package="gconf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="libsoup"/>