Problems using gnome-2-18 branch for evolution-data-server in jhbuild

[Luca Ferretti <elle uca libero it>]

It seems that evo stuff silently branched for GNOME 2.18.

I tried to update jhbuild moduleset to use this branch (patch attached),
but it seems there are some issues against libical in
evolution-data-server. Here is the jhbuild console log trying to perform
the svn switch:

--------------------------------------------------------------

*** Checking out evolution-data-server *** [1/91]

svn switch http://svn.gnome.org/svn/evolution-data-server/branches/gnome-2-18

svn: URL 'http://svn.gnome.org/svn/libical/gnome-2-18' doesn't exist

Fetching external item into 'calendar/libical'
*** error during stage checkout of evolution-data-server: ########## 
Error running svn update . *** [1/91]

---------------------------------------------------------------

Any idea? Please note that jhbuild is trying to get the wrong
"directory": it should be svn.gnome.org/svn/libical/branches/gnome-2-18,
not svn.gnome.org/svn/libical/gnome-2-18

Index: modulesets/gnome-2.18.modules
===================================================================
--- modulesets/gnome-2.18.modules	(revisione 1430)
+++ modulesets/gnome-2.18.modules	(copia locale)
@@ -1508,20 +1508,19 @@
     </dependencies>
   </autotools>
   <autotools id="gtkhtml">
-    <branch/>
+    <branch revision="gnome-2-18"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="libgnomeui"/>
       <dep package="libbonoboui"/>
       <dep package="libglade"/>
       <dep package="gail"/>
-      <dep package="libgnomeprint"/>
-      <dep package="libgnomeprintui"/>
       <dep package="libsoup"/>
+      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
   <autotools id="evolution-data-server" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-2-18"/>
     <dependencies>
       <dep package="libbonobo"/>
       <dep package="libgnome"/>
@@ -1534,7 +1533,7 @@
     </dependencies>
   </autotools>
   <autotools id="evolution">
-    <branch/>
+    <branch revision="gnome-2.18"/>
     <dependencies>
       <dep package="evolution-data-server"/>
       <dep package="gtkhtml"/>
@@ -1555,7 +1554,7 @@
     </dependencies>
   </autotools>
   <autotools id="evolution-exchange">
-    <branch/>
+    <branch revision="gnome-2-18"/>
     <dependencies>
        <dep package="evolution-data-server"/>
        <dep package="evolution"/>