[jhbuild] fix mostly minor XML validation errors

[Frederic Peters <fpeters src gnome org>]

commit 78f8315b5888a3b3bd73eec030fbc06f3242e915
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Mar 18 21:45:20 2015 +0100

    fix mostly minor XML validation errors

 modulesets/gnome-apps-3.16.modules             |    4 +++-
 modulesets/gnome-suites-core-deps-3.16.modules |    6 +++---
 modulesets/gnome-sysdeps-3.14.modules          |    6 +++---
 modulesets/gnome-sysdeps-3.16.modules          |    6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.16.modules b/modulesets/gnome-apps-3.16.modules
index be0e6ac..7340589 100644
--- a/modulesets/gnome-apps-3.16.modules
+++ b/modulesets/gnome-apps-3.16.modules
@@ -386,8 +386,10 @@
             version="0.22.0"
             hash="b70965b35e6d0adc891ba2edb28d982cb27729a3f2bb02186084f692e94922b2"
             checkoutdir="libgit2-${version}">
-      <dep package="libssh2"/>
     </branch>
+    <dependencies>
+      <dep package="libssh2"/>
+    </dependencies>
   </cmake>
 
   <autotools id="libgit2-glib">
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index e0ff538..3f9b177 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -86,11 +86,11 @@
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-gl">
-    <branch repo="git.freedesktop.org">
-    </branch>
     <if condition-set="quartz">
       <autogenargs value="--enable-quartz --disable-gl"/>
     </if>
+    <branch repo="git.freedesktop.org">
+    </branch>
     <dependencies>
       <if condition-unset="quartz">
         <dep package="fontconfig"/>
@@ -1505,10 +1505,10 @@
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <if condition-set="quartz">
       <autogenargs value="--with-backend=quartz"/>
     </if>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
diff --git a/modulesets/gnome-sysdeps-3.14.modules b/modulesets/gnome-sysdeps-3.14.modules
index cd51446..f5397c2 100644
--- a/modulesets/gnome-sysdeps-3.14.modules
+++ b/modulesets/gnome-sysdeps-3.14.modules
@@ -878,13 +878,13 @@
   </systemmodule>
 
   <systemmodule id="protobuf">
-    <branch repo="system" version="2.5.0"/>
     <pkg-config>protobuf.pc</pkg-config>
+    <branch repo="system" version="2.5.0"/>
   </systemmodule>
 
   <systemmodule id="egl">
-    <branch repo="system" version="10.1.3"/>
     <pkg-config>egl.pc</pkg-config>
+    <branch repo="system" version="10.1.3"/>
   </systemmodule>
 
   <systemmodule id="glm">
@@ -895,7 +895,7 @@
   </systemmodule>
 
   <systemmodule id="lttng-ust">
-    <branch repo="system" version="2.3.0"/>
     <pkg-config>lttng-ust.pc</pkg-config>
+    <branch repo="system" version="2.3.0"/>
   </systemmodule>
 </moduleset>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 286feae..c5d08e8 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -1087,13 +1087,13 @@
   </systemmodule>
 
   <systemmodule id="protobuf">
-    <branch repo="system" version="2.5.0"/>
     <pkg-config>protobuf.pc</pkg-config>
+    <branch repo="system" version="2.5.0"/>
   </systemmodule>
 
   <systemmodule id="egl">
-    <branch repo="system" version="10.1.3"/>
     <pkg-config>egl.pc</pkg-config>
+    <branch repo="system" version="10.1.3"/>
   </systemmodule>
 
   <systemmodule id="glm">
@@ -1104,8 +1104,8 @@
   </systemmodule>
 
   <systemmodule id="lttng-ust">
-    <branch repo="system" version="2.3.0"/>
     <pkg-config>lttng-ust.pc</pkg-config>
+    <branch repo="system" version="2.3.0"/>
   </systemmodule>
 
   <systemmodule id="WebKit1">