[jhbuild] 3.20: Organize gnome-apps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit dd0a6e92ffb7e78b4d9ee5b877bcab6ee5039449
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 20:37:58 2016 -0600

    3.20: Organize gnome-apps

 modulesets/gnome-apps-3.20.modules |  496 +++++++++++++++++++-----------------
 1 files changed, 258 insertions(+), 238 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 0be5e4d..79643a9 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -31,36 +31,20 @@
   <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
-    -->
 
-  <autotools id="dconf-editor">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="glib"/>
-      <dep package="dconf"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
+       Please try to keep organized alphabetically by section:
 
-  <autotools id="gnome-todo">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
+       1) Dependencies
+       2) Normal apps
+       3) Games
+       4) Metamodules
+    -->
 
-  <autotools id="ghex">
+<!-- Dependencies and miscellaneous -->
+
+  <autotools id="gnome-getting-started-docs">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -158,17 +142,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="qqwing">
-    <branch repo="qqwing"
-            module="qqwing-${version}.tar.gz"
-            version="1.3.4"
-            hash="sha256:1753736c31feea0085f5cfac33143743204f8a7e66b81ccd17e249ecafba802f"
-            size="352060"/>
-    <dependencies>
-      <dep package="c++"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gdl">
     <branch/>
     <dependencies>
@@ -187,6 +160,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-devel-docs">
+    <branch/>
+    <dependencies>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="jhbuild">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="yelp-tools"/>
+      <dep package="gettext-bin"/>
+      <dep package="xmlcatalog"/>
+      <dep package="pkg-config"/>
+      <dep package="python2"/>
+      <dep package="cc"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="libgit2"
          cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="tarball.github.com"
@@ -209,6 +202,45 @@
     </dependencies>
   </autotools>
 
+  <autotools id="nautilus-sendto">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="evolution-data-server"/>
+      <dep package="nautilus"/>
+    </dependencies>
+    <suggests>
+      <dep package="gupnp-av"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="qqwing">
+    <branch repo="qqwing"
+            module="qqwing-${version}.tar.gz"
+            version="1.3.4"
+            hash="sha256:1753736c31feea0085f5cfac33143743204f8a7e66b81ccd17e249ecafba802f"
+            size="352060"/>
+    <dependencies>
+      <dep package="c++"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rygel">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-dlna"/>
+      <dep package="libgee"/>
+      <dep package="tracker"/>
+      <dep package="valadoc"/>
+      <dep package="libmediaart"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="uncrustify">
     <branch repo="downloads.sourceforge.net"
             module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
@@ -220,6 +252,17 @@
     </dependencies>
   </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>
+
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -235,97 +278,66 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-multi-writer">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="libgusb"/>
-      <dep package="udisks"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="devhelp">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glade">
+  <autotools id="anjuta">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gnome-common"/>
-      <dep package="gtk-doc" />
+      <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
-      <dep package="libxml2"/>
+      <dep package="vte"/>
+      <dep package="gdl"/>
+      <dep package="libgda-5.2"/>
+      <dep package="gtksourceview"/>
       <dep package="yelp-tools"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="gnome-code-assistance">
-    <branch/>
-    <dependencies>
+    <suggests>
+      <dep package="glade"/>
+      <dep package="devhelp"/>
       <dep package="vala"/>
-    </dependencies>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-devel-docs">
+  <autotools id="brasero">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-inotify"/>
+    </if>
     <branch/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libcanberra"/>
+      <dep package="libnotify"/>
+      <dep package="libxml2"/>
       <dep package="yelp-tools"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="rygel">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-      <dep package="libgee"/>
+    <suggests>
+      <dep package="nautilus"/>
+      <dep package="totem-pl-parser"/>
       <dep package="tracker"/>
-      <dep package="valadoc"/>
-      <dep package="libmediaart"/>
-    </dependencies>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-sound-recorder">
+  <autotools id="dconf-editor">
     <branch/>
     <dependencies>
-      <dep package="gjs"/>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="dconf"/>
       <dep package="gtk+"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-<!-- Featured Apps -->
-
-  <autotools id="anjuta">
+  <autotools id="devhelp">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-      <dep package="libgda-5.2"/>
-      <dep package="gtksourceview"/>
-      <dep package="yelp-tools"/>
+      <dep package="WebKit"/>
     </dependencies>
-    <suggests>
-      <dep package="glade"/>
-      <dep package="devhelp"/>
-      <dep package="vala"/>
-    </suggests>
   </autotools>
 
   <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
@@ -382,6 +394,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="ghex">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gitg">
     <branch/>
     <dependencies>
@@ -403,6 +425,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="glade">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-common"/>
+      <dep package="gtk-doc" />
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-builder">
     <branch/>
     <dependencies>
@@ -423,13 +457,137 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-getting-started-docs">
+  <autotools id="gnome-code-assistance">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-multi-writer">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="libgusb"/>
+      <dep package="udisks"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-nettool">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgtop"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sound-recorder">
     <branch/>
     <dependencies>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-todo">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-tweak-tool">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+      <dep package="gsettings-desktop-schemas"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nemiver"
+             autogenargs="--enable-gsettings=yes">
+    <branch/>
+    <dependencies>
+      <dep package="boost"/>
+      <dep package="gdb"/>
+      <dep package="gdlmm"/>
+      <dep package="gtkmm"/>
+      <dep package="glibmm"/>
+      <dep package="gtksourceviewmm"/>
+      <dep package="vte"/>
+      <dep package="libgtop"/>
+      <dep package="libxml2"/>
+      <dep package="ghex"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
+  <autotools id="polari">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="m4-common"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="seahorse">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
+      <dep package="gcr"/>
+      <dep package="yelp-tools"/>
+      <dep package="gpgme"/>
+      <dep package="gnupg"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="vinagre">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="gtk+"/>
+      <dep package="gtk-vnc"/>
+      <dep package="libsecret"/>
+      <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="spice-gtk"/>
+      <dep package="telepathy-glib"/>
+      <dep package="vte"/>
+    </suggests>
+  </autotools>
+
+<!-- Games -->
+
   <autotools id="five-or-more">
     <branch/>
     <dependencies>
@@ -570,15 +728,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-tweak-tool">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="hitori">
     <branch/>
     <dependencies>
@@ -658,135 +807,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-nettool">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgtop"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="nautilus-sendto">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="evolution-data-server"/>
-      <dep package="nautilus"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-av"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="nemiver"
-             autogenargs="--enable-gsettings=yes">
-    <branch/>
-    <dependencies>
-      <dep package="boost"/>
-      <dep package="gdb"/>
-      <dep package="gdlmm"/>
-      <dep package="gtkmm"/>
-      <dep package="glibmm"/>
-      <dep package="gtksourceviewmm"/>
-      <dep package="vte"/>
-      <dep package="libgtop"/>
-      <dep package="libxml2"/>
-      <dep package="ghex"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="polari">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="m4-common"/>
-      <dep package="telepathy-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="seahorse">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
-      <dep package="gcr"/>
-      <dep package="yelp-tools"/>
-      <dep package="gpgme"/>
-      <dep package="gnupg"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="vinagre">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libsecret"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="spice-gtk"/>
-      <dep package="telepathy-glib"/>
-      <dep package="vte"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="brasero">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-inotify"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libcanberra"/>
-      <dep package="libnotify"/>
-      <dep package="libxml2"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="nautilus"/>
-      <dep package="totem-pl-parser"/>
-      <dep package="tracker"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="jhbuild">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="yelp-tools"/>
-      <dep package="gettext-bin"/>
-      <dep package="xmlcatalog"/>
-      <dep package="pkg-config"/>
-      <dep package="python2"/>
-      <dep package="cc"/>
-    </dependencies>
-  </autotools>
-
 <!-- Meta Modules -->
 
   <!-- Tested applications: these are built continuously by build.gnome.org