[jhbuild] Update openchange and samba4-related versions for evolution-mapi 3.2

[Craig Keogh <cskeogh src gnome org>]

commit f06f666564ef806c4a1169442db623605801049a
Author: Sean Finney <seanius seanius net>
Date:   Fri Aug 5 13:41:26 2011 +0200

    Update openchange and samba4-related versions for evolution-mapi 3.2

 modulesets/gnome-world-3.2.modules |   66 ++++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 9f10fb2..1fb8b0b 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -116,6 +116,8 @@
       trunk-template="%(module)s"
       branches-template="%(branch)s"
       tags-template="%(tag)s"/>
+  <repository type="tarball" name="openchange.org"
+      href="http://tracker.openchange.org/attachments/download/"/>
 
   <include href="gnome-apps-3.2.modules"/>
 
@@ -1938,58 +1940,64 @@
   </autotools>
 
   <autotools id="samba4" skip-autogen="never" autogen-sh="configure"
-             autogenargs="--enable-fhs" supports-non-srcdir-builds="no">
+             supports-non-srcdir-builds="no">
     <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="source4">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
+            module="samba4/samba-4.0.0alpha16.tar.gz" version="4.0.0alpha16"
+            hash="sha256:9199c0fa4973185c64e518dee349e060830f218df79c3050381ef8a1c89bf036"
+            md5sum="66afcc4484e7e2b1962554aed3b9c2a7" size="18909369">
     </branch>
   </autotools>
 
   <autotools id="talloc"
-	    makeargs="tallocdir='$(srcdir)'"
-	    makeinstallargs="install tallocdir='$(srcdir)'">
+             skip-autogen="never" autogen-sh="configure"
+             makeargs="tallocdir='$(srcdir)'"
+             makeinstallargs="install tallocdir='$(srcdir)'">
+    <branch repo="samba.org"
+            module="samba4/samba-4.0.0alpha16.tar.gz" version="4.0.0alpha16"
+            hash="sha256:9199c0fa4973185c64e518dee349e060830f218df79c3050381ef8a1c89bf036"
+            md5sum="66afcc4484e7e2b1962554aed3b9c2a7" size="18909369"
+            source-subdir="lib/talloc">
+    </branch>
+  </autotools>
+
+  <autotools id="tdb" skip-autogen="never" autogen-sh="configure">
     <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="lib/talloc">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
+            module="samba4/samba-4.0.0alpha16.tar.gz" version="4.0.0alpha16"
+            hash="sha256:9199c0fa4973185c64e518dee349e060830f218df79c3050381ef8a1c89bf036"
+            md5sum="66afcc4484e7e2b1962554aed3b9c2a7" size="18909369"
+            source-subdir="lib/tdb">
     </branch>
   </autotools>
 
-  <autotools id="tdb">
+  <autotools id="tevent" skip-autogen="never" autogen-sh="configure">
     <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="lib/tdb">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
+            module="samba4/samba-4.0.0alpha16.tar.gz" version="4.0.0alpha16"
+            hash="sha256:9199c0fa4973185c64e518dee349e060830f218df79c3050381ef8a1c89bf036"
+            md5sum="66afcc4484e7e2b1962554aed3b9c2a7" size="18909369"
+            source-subdir="lib/tevent">
     </branch>
   </autotools>
 
-  <autotools id="tevent">
+  <autotools id="ldb" skip-autogen="never" autogen-sh="configure">
     <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="lib/tevent">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
+            module="samba4/samba-4.0.0alpha16.tar.gz" version="4.0.0alpha16"
+            hash="sha256:9199c0fa4973185c64e518dee349e060830f218df79c3050381ef8a1c89bf036"
+            md5sum="66afcc4484e7e2b1962554aed3b9c2a7" size="18909369"
+            source-subdir="source4/lib/ldb">
     </branch>
   </autotools>
 
   <autotools id="libmapi" skip-autogen="never" autogen-sh="configure"
              supports-non-srcdir-builds="no">
-    <branch repo="sourceforge.net"
-            module="openchange/openchange-0.9-COCHRANE.tar.gz" version="0.9"
-            hash="sha256:b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402"
-            md5sum="9dc6c91ea5d4afce4a5aa81215835b8b" size="1601358"/>
+    <branch repo="openchange.org"
+            module="142/openchange-0.11-TRANSPORTER.tar.gz" version="0.11"
+            hash="sha256:d6e69d967337e7967d7b1aee61ca8ff48dde7140c66b681f2eb9b246157eed0b"
+            md5sum="7e5d2de7399f429048390a04aa8c5e79" size="1920597"/>
     <dependencies>
       <dep package="tdb"/>
       <dep package="talloc"/>
       <dep package="tevent"/>
+      <dep package="ldb"/>
       <dep package="samba4"/>
     </dependencies>
   </autotools>