[jhbuild] moduleset.rnc: The order of <dep> and <if> is not significant

[Ting-Wei Lan <lantw src gnome org>]

commit 482a5047ff3027d0bebeb846d94545c49319383d
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat Sep 19 12:29:44 2015 +0800

    moduleset.rnc: The order of <dep> and <if> is not significant
    
    This should fix all validation errors in modulesets because the order
    of elements is significant in rnc by default.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=754041

 modulesets/moduleset.rnc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/moduleset.rnc b/modulesets/moduleset.rnc
index b767be2..701e8d2 100644
--- a/modulesets/moduleset.rnc
+++ b/modulesets/moduleset.rnc
@@ -217,9 +217,9 @@ attlist.tested &= attribute package { text }
 # Other children
 attlist.if = attribute condition-set { text } | attribute condition-unset { text }
 depif = element if { attlist.if, depif*, dep* }
-dependencies = element dependencies { attlist.dependencies, depif*, dep* }
+dependencies = element dependencies { attlist.dependencies & depif* & dep* }
 attlist.dependencies &= empty
-suggests = element suggests { attlist.suggests, depif*, dep* }
+suggests = element suggests { attlist.suggests & depif* & dep* }
 attlist.suggests &= empty
 after = element after { attlist.after, dep* }
 attlist.after &= empty