[jhbuild/wip/mcatanzaro/core-apps: 5/37] 3.20: Rearrange core

From: Michael Catanzaro <mcatanzaro src gnome org>
To: commits-list gnome org
Cc:
Subject: [jhbuild/wip/mcatanzaro/core-apps: 5/37] 3.20: Rearrange core
Date: Mon, 18 Jan 2016 02:52:02 +0000 (UTC)
commit 104129e56b9b7af049bc70ba3df19162556f322a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 18:16:31 2016 -0600

    3.20: Rearrange core

 modulesets/gnome-suites-core-3.20.modules |  288 +++++++++++++++--------------
 1 files changed, 149 insertions(+), 139 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index ec87518..abfee21 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -26,17 +26,28 @@
 
 <include href="gnome-suites-core-deps-3.20.modules"/>
 
-<!-- Please try to keep organized alphabetically by section -->
+
+<!-- Please try to keep organized alphabetically by section:
+
+     1) Core User Shell (hosted on git.gnome.org)
+     2) Core Utilities (anything that's an app)
+     3) Core OS Services (non-GNOME, mostly freedesktop stuff)
+     4) Metamodules
+
+     All modules in this file should be in a metamodule.
+  -->
 
 
 <!-- Core User Shell -->
 
-  <autotools id="at-spi2-core">
+  <autotools id="adwaita-icon-theme">
     <branch/>
     <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="libXtst"/>
+      <dep package="hicolor-icon-theme"/>
+      <dep package="gnome-common"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
@@ -51,27 +62,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cheese">
+  <autotools id="at-spi2-core">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
+      <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="clutter-gst3"/>
-      <dep package="clutter-gtk"/>
-      <dep package="libcanberra"/>
-      <dep package="vala"/>
-      <dep package="gnome-video-effects"/>
-      <dep package="librsvg"/>
-      <dep package="gnome-desktop"/>
-      <if condition-set="linux">
-        <dep package="gudev"/>
-      </if>
+      <dep package="libXtst"/>
     </dependencies>
   </autotools>
 
@@ -116,59 +112,69 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-backgrounds">
+  <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
+    <if condition-unset="linux">
+      <autogenargs value="--without-plymouth"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="accountsservice"/>
+      <dep package="dbus-glib"/>
+      <dep package="fontconfig"/>
       <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="nss"/>
+      <dep package="pam"/>
+      <if condition-set="linux">
+        <dep package="plymouth"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
+    <suggests>
+      <dep package="upower"/>
+      <dep package="yelp-tools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-bluetooth">
+  <autotools id="glib-networking" autogenargs="--enable-installed-tests">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
       <dep package="glib"/>
-      <dep package="nautilus-sendto"/>
+      <dep package="intltool"/>
+      <dep package="libproxy"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gnutls"/>
+      <dep package="p11-kit"/>
     </dependencies>
-    <suggests>
-      <dep package="geoclue"/>
-    </suggests>
   </autotools>
 
-  <autotools id="gnome-online-accounts">
+  <autotools id="gnome-backgrounds">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
-      <dep package="json-glib"/>
-      <dep package="libsecret"/>
-      <dep package="libxml2"/>
-      <dep package="telepathy-glib"/>
+      <dep package="intltool"/>
+      <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+  <autotools id="gnome-bluetooth">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-bluetooth"/>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="iso-codes"/>
-      <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
+      <dep package="gtk-doc"/>
+      <dep package="glib"/>
+      <dep package="nautilus-sendto"/>
     </dependencies>
     <suggests>
-      <dep package="mobile-broadband-provider-info"/>
+      <dep package="geoclue"/>
     </suggests>
   </autotools>
 
@@ -238,17 +244,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme">
-    <branch/>
-    <dependencies>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="gnome-common"/>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-keyring">
     <branch/>
     <dependencies>
@@ -273,6 +268,21 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-online-accounts">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="WebKit"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
+      <dep package="json-glib"/>
+      <dep package="libsecret"/>
+      <dep package="libxml2"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-session">
     <branch/>
     <dependencies>
@@ -377,20 +387,11 @@
     </after>
   </autotools>
 
-  <autotools id="gnome-software">
+  <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
-      <dep package="libsoup"/>
-      <dep package="PackageKit"/>
-      <dep package="sqlite3"/>
-      <if condition-set="linux">
-        <dep package="fwupd"/>
-      </if>
+      <dep package="gnome-shell"/>
+      <dep package="gnome-menus"/>
     </dependencies>
   </autotools>
 
@@ -405,6 +406,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-user-docs">
+    <branch/>
+    <dependencies>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-user-share">
     <if condition-unset="linux">
       <autogenargs value="--disable-bluetooth"/>
@@ -457,21 +465,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="glib-networking" autogenargs="--enable-installed-tests">
-    <if condition-set="freebsd">
-      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="intltool"/>
-      <dep package="libproxy"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gnutls"/>
-      <dep package="p11-kit"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="mousetweaks">
     <branch/>
     <dependencies>
@@ -521,6 +514,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
     <if condition-unset="linux">
@@ -602,6 +615,30 @@
     </dependencies>
   </autotools>
 
+  <autotools id="cheese">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="clutter-gst3"/>
+      <dep package="clutter-gtk"/>
+      <dep package="libcanberra"/>
+      <dep package="vala"/>
+      <dep package="gnome-video-effects"/>
+      <dep package="librsvg"/>
+      <dep package="gnome-desktop"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="eog">
     <branch/>
     <dependencies>
@@ -807,6 +844,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-software">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+      <dep package="PackageKit"/>
+      <dep package="sqlite3"/>
+      <if condition-set="linux">
+        <dep package="fwupd"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-system-monitor">
     <branch/>
     <dependencies>
@@ -840,13 +894,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-user-docs">
-    <branch/>
-    <dependencies>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="nautilus">
     <if condition-unset="linux">
       <autogenargs value="--disable-selinux"/>
@@ -981,36 +1028,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
-    <if condition-unset="linux">
-      <autogenargs value="--without-plymouth"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="accountsservice"/>
-      <dep package="dbus-glib"/>
-      <dep package="fontconfig"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="nss"/>
-      <dep package="pam"/>
-      <if condition-set="linux">
-        <dep package="plymouth"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
-        <dep package="libsystemd-journal"/>
-      </if>
-    </dependencies>
-    <suggests>
-      <dep package="upower"/>
-      <dep package="yelp-tools"/>
-    </suggests>
-  </autotools>
-
   <autotools id="NetworkManager"
              autogenargs="--with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no --with-crypto=gnutls 
--disable-wimax --disable-more-warnings">
     <branch repo="git.freedesktop.org"
@@ -1100,13 +1117,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-shell"/>
-      <dep package="gnome-menus"/>
-    </dependencies>
-  </autotools>
 
 <!-- Meta Modules -->
 
@@ -1142,13 +1152,14 @@
   </metamodule>
 
   <!-- The Core GNOME UX Shell: Only integrated session services,
-       data, and core UI allowed
+       data, and core UI allowed.
   -->
   <metamodule id="meta-gnome-core-shell">
     <dependencies>
       <dep package="adwaita-icon-theme"/>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
+      <dep package="gdm"/>
       <dep package="gnome-backgrounds"/>
       <dep package="gnome-control-center"/>
       <dep package="gnome-initial-setup"/>
@@ -1157,6 +1168,7 @@
       <dep package="gnome-session"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gnome-shell"/>
+      <dep package="gnome-shell-extensions"/>
       <dep package="gnome-themes-standard"/>
       <dep package="gnome-user-docs"/>
       <dep package="gnome-user-share"/>
@@ -1183,7 +1195,6 @@
       <dep package="ConsoleKit"/>
       <dep package="cups"/>
       <dep package="dbus"/>
-      <dep package="gdm"/>
       <dep package="PackageKit"/>
       <dep package="upower"/>
       <!-- <dep package="systemd"/> -->
@@ -1202,7 +1213,6 @@
     <dependencies>
       <dep package="meta-gnome-core-shell"/>
       <dep package="meta-gnome-core-utilities"/>
-      <dep package="gnome-shell-extensions"/>
     </dependencies>
   </metamodule>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]