[jhbuild] apps-3.20: Move weston back to wayland moduleset

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 4df1bedb8ab525016246f896d28c7caf88ff79bd
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Jan 20 15:52:02 2016 +0000

    apps-3.20: Move weston back to wayland moduleset
    
    This was added for testing in the transition to make gnome-shell
    a wayland compositor

 modulesets/gnome-apps-3.20.modules |   11 -----------
 modulesets/other/wayland.modules   |    2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 371b125..947dfb0 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -1132,17 +1132,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="weston" autogenargs="--disable-setuid-install">
-    <branch repo="wayland"/>
-    <dependencies>
-      <dep package="wayland-protocols"/>
-      <dep package="wayland"/>
-      <dep package="cairo"/>
-      <dep package="libxkbcommon"/>
-      <dep package="mesa-libGLES"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="jhbuild">
     <branch/>
     <dependencies>
diff --git a/modulesets/other/wayland.modules b/modulesets/other/wayland.modules
index 80d4b7d..4c3d319 100644
--- a/modulesets/other/wayland.modules
+++ b/modulesets/other/wayland.modules
@@ -55,9 +55,11 @@
   <autotools id="weston" autogenargs="--disable-setuid-install">
     <branch repo="wayland"/>
     <dependencies>
+      <dep package="wayland-protocols"/>
       <dep package="wayland"/>
       <dep package="cairo"/>
       <dep package="libxkbcommon"/>
+      <dep package="mesa-libGLES"/>
     </dependencies>
   </autotools>