[jhbuild/jjardon/reorganisation: 3/4] 3.16: Move core utilities to their own moduleset: gnome-core-apps
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/jjardon/reorganisation: 3/4] 3.16: Move core utilities to their own moduleset: gnome-core-apps
- Date: Sun, 12 Oct 2014 17:08:28 +0000 (UTC)
commit 9202785e00830d5e09564a7f4fd9ae49003bcaca
Author: Javier Jardón <jjardon gnome org>
Date: Fri Oct 10 22:41:26 2014 +0100
3.16: Move core utilities to their own moduleset: gnome-core-apps
modulesets/gnome-core-3.16.modules | 336 +-----------------------------
modulesets/gnome-core-apps-3.16.modules | 347 +++++++++++++++++++++++++++++++
modulesets/gnome-meta-3.16.modules | 11 +-
3 files changed, 355 insertions(+), 339 deletions(-)
---
diff --git a/modulesets/gnome-core-3.16.modules b/modulesets/gnome-core-3.16.modules
index d46369a..53a531d 100644
--- a/modulesets/gnome-core-3.16.modules
+++ b/modulesets/gnome-core-3.16.modules
@@ -509,247 +509,16 @@
</autotools>
-<!-- Core Utilities -->
-
- <autotools id="baobab">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="vala"/>
- <dep package="yelp-tools"/>
- </dependencies>
- </autotools>
-
- <autotools id="empathy" autogenargs="--disable-Werror">
- <branch/>
- <dependencies>
- <dep package="clutter"/>
- <dep package="clutter-gst"/>
- <dep package="clutter-gtk"/>
- <dep package="dbus-glib"/>
- <dep package="intltool"/>
- <dep package="farstream"/>
- <dep package="folks"/>
- <dep package="gcr"/>
- <dep package="glib"/>
- <dep package="libgee"/>
- <dep package="libsecret"/>
- <dep package="gnome-online-accounts"/>
- <dep package="gnutls"/>
- <dep package="gsettings-desktop-schemas"/>
- <dep package="gstreamer"/>
- <dep package="gtk+"/>
- <dep package="libcanberra"/>
- <dep package="libsoup"/>
- <dep package="libxml2"/>
- <dep package="pulseaudio"/>
- <dep package="telepathy-farstream"/>
- <dep package="telepathy-glib"/>
- <dep package="telepathy-logger"/>
- <dep package="telepathy-mission-control"/>
- <dep package="libnotify"/>
- <dep package="WebKit1"/>
- </dependencies>
- <suggests>
- <dep package="enchant"/>
- <dep package="geoclue"/>
- <dep package="geocode-glib"/>
- <dep package="iso-codes"/>
- <dep package="libchamplain"/>
- <if condition-set="linux">
- <dep package="NetworkManager"/>
- <dep package="gudev"/>
- </if>
- </suggests>
- </autotools>
-
- <autotools id="eog">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gdk-pixbuf"/>
- <dep package="gtk+"/>
- <dep package="gnome-desktop"/>
- <dep package="gobject-introspection"/>
- <dep package="gsettings-desktop-schemas"/>
- <dep package="libjpeg"/>
- <dep package="libpeas"/>
- <dep package="libxml2"/>
- <dep package="shared-mime-info"/>
- <dep package="yelp-tools"/>
- </dependencies>
- <suggests>
- <dep package="exempi"/>
- <dep package="libexif"/>
- <dep package="lcms2"/>
- <dep package="librsvg"/>
- </suggests>
- </autotools>
-
- <autotools id="epiphany">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="iso-codes"/>
- <dep package="gtk+"/>
- <dep package="startup-notification"/>
- <dep package="WebKit"/>
- <dep package="gcr"/>
- <dep package="avahi"/>
- <dep package="gnome-desktop"/>
- <dep package="libwnck"/>
- <dep package="libsecret"/>
- <dep package="libsoup"/>
- </dependencies>
- <suggests>
- <dep package="enchant"/>
- <dep package="libnotify"/>
- <dep package="libcanberra"/>
- <dep package="nss"/>
- </suggests>
- </autotools>
-
- <autotools id="evince" autogenargs="--enable-introspection"
- supports-parallel-builds="no">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="libxml2"/>
- <dep package="adwaita-icon-theme"/>
- <dep package="libsecret"/>
- <dep package="poppler"/>
- <dep package="nautilus"/>
- <dep package="libgxps"/>
- <dep package="yelp-tools"/>
- </dependencies>
- <suggests>
- <dep package="libsecret"/>
- </suggests>
- </autotools>
-
- <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="gtksourceview"/>
- <dep package="libxml2"/>
- <dep package="vala"/>
- <dep package="yelp-tools"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnome-contacts">
- <branch/>
- <dependencies>
- <dep package="folks"/>
- <dep package="glib"/>
- <dep package="gnome-desktop"/>
- <dep package="gnome-online-accounts"/>
- <dep package="gtk+"/>
- <dep package="libgee"/>
- <dep package="libnotify"/>
- <dep package="telepathy-glib"/>
- <dep package="vala"/>
- </dependencies>
- <suggests>
- <dep package="cheese"/>
- <dep package="gstreamer"/>
- </suggests>
- </autotools>
-
- <autotools id="gnome-dictionary">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="yelp-tools"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnome-disk-utility">
- <branch/>
- <dependencies>
- <dep package="glib"/>
- <dep package="gnome-settings-daemon"/>
- <dep package="gtk+"/>
- <dep package="libnotify"/>
- <dep package="libpwquality"/>
- <dep package="libsecret"/>
- <dep package="udisks"/>
- <dep package="dvdread"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnome-font-viewer">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gnome-desktop"/>
- <dep package="gtk+"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnome-screenshot">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- </dependencies>
- </autotools>
-
- <autotools id="gnome-system-log">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="yelp-tools"/>
- </dependencies>
- </autotools>
+<!-- Core Extras -->
- <autotools id="gnome-system-monitor">
+ <autotools id="gnome-backgrounds">
<branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
- <dep package="libwnck"/>
- <dep package="libgtop"/>
- <dep package="gtk+"/>
- <dep package="gtkmm"/>
- <dep package="libxml2"/>
- <dep package="librsvg"/>
</dependencies>
</autotools>
- <autotools id="gnome-terminal" autogenargs="--disable-migration">
- <branch/>
- <dependencies>
- <dep package="dconf"/>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="gsettings-desktop-schemas"/>
- <dep package="libuuid"/>
- <dep package="vte"/>
- <dep package="yelp-tools"/>
- <dep package="nautilus"/>
- <dep package="appdata-tools"/>
- </dependencies>
- <suggests>
- <dep package="gnome-shell"/>
- </suggests>
- </autotools>
-
<autotools id="gnome-user-docs">
<branch/>
<dependencies>
@@ -757,107 +526,6 @@
</dependencies>
</autotools>
- <autotools id="gucharmap">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="yelp-tools"/>
- </dependencies>
- </autotools>
-
- <autotools id="nautilus">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="pango"/>
- <dep package="libnotify"/>
- <dep package="libxml2"/>
- <dep package="gnome-desktop"/>
- <dep package="gsettings-desktop-schemas"/>
- <dep package="tracker"/>
- <dep package="exempi"/>
- <dep package="libexif"/>
- </dependencies>
- </autotools>
-
- <autotools id="sushi">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="gobject-introspection"/>
- <dep package="gjs"/>
- <dep package="libmusicbrainz"/>
- <dep package="evince"/>
- <dep package="clutter"/>
- <dep package="clutter-gtk"/>
- <dep package="clutter-gst"/>
- <dep package="gtksourceview"/>
- <dep package="WebKit1"/>
- <dep package="gstreamer"/>
- <dep package="gst-plugins-base"/>
- <dep package="gtk+"/>
- </dependencies>
- </autotools>
-
- <autotools id="totem">
- <branch/>
- <dependencies>
- <dep package="appdata-tools"/>
- <dep package="cairo"/>
- <dep package="clutter"/>
- <dep package="clutter-gst"/>
- <dep package="clutter-gtk"/>
- <dep package="gdk-pixbuf"/>
- <dep package="glib"/>
- <dep package="grilo"/>
- <dep package="grilo-plugins"/>
- <dep package="gsettings-desktop-schemas"/>
- <dep package="gstreamer"/>
- <dep package="gst-plugins-base"/>
- <dep package="gst-plugins-good"/>
- <dep package="gst-plugins-bad"/>
- <dep package="gtk+"/>
- <dep package="intltool"/>
- <dep package="iso-codes"/>
- <dep package="libpeas"/>
- <dep package="totem-pl-parser"/>
- <dep package="yelp-tools"/>
- </dependencies>
- <suggests>
- <dep package="zeitgeist"/>
- </suggests>
- </autotools>
-
- <autotools id="yelp">
- <if condition-set="freebsd">
- <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
- </if>
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- <dep package="gtk+"/>
- <dep package="libxml2"/>
- <dep package="libxslt"/>
- <dep package="WebKit1"/>
- <dep package="yelp-xsl"/>
- </dependencies>
- </autotools>
-
-<!-- Core Extras -->
-
- <autotools id="gnome-backgrounds">
- <branch/>
- <dependencies>
- <dep package="intltool"/>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<autotools id="gnome-user-share">
<if condition-unset="linux">
<autogenargs value="--disable-bluetooth"/>
diff --git a/modulesets/gnome-core-apps-3.16.modules b/modulesets/gnome-core-apps-3.16.modules
new file mode 100644
index 0000000..c89b993
--- /dev/null
+++ b/modulesets/gnome-core-apps-3.16.modules
@@ -0,0 +1,347 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<!-- vim:set ts=2 expandtab: -->
+<moduleset>
+
+ <!-- git repos -->
+ <repository type="git" name="git.gnome.org" default="yes"
+ href="git://git.gnome.org/"/>
+
+ <include href="gnome-core-3.16.modules"/>
+
+ <!-- Please try to keep organized alphabetically -->
+
+ <!-- Core Apps -->
+
+ <autotools id="baobab">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="vala"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="empathy" autogenargs="--disable-Werror">
+ <branch/>
+ <dependencies>
+ <dep package="clutter"/>
+ <dep package="clutter-gst"/>
+ <dep package="clutter-gtk"/>
+ <dep package="dbus-glib"/>
+ <dep package="intltool"/>
+ <dep package="farstream"/>
+ <dep package="folks"/>
+ <dep package="gcr"/>
+ <dep package="glib"/>
+ <dep package="libgee"/>
+ <dep package="libsecret"/>
+ <dep package="gnome-online-accounts"/>
+ <dep package="gnutls"/>
+ <dep package="gsettings-desktop-schemas"/>
+ <dep package="gstreamer"/>
+ <dep package="gtk+"/>
+ <dep package="libcanberra"/>
+ <dep package="libsoup"/>
+ <dep package="libxml2"/>
+ <dep package="pulseaudio"/>
+ <dep package="telepathy-farstream"/>
+ <dep package="telepathy-glib"/>
+ <dep package="telepathy-logger"/>
+ <dep package="telepathy-mission-control"/>
+ <dep package="libnotify"/>
+ <dep package="WebKit1"/>
+ </dependencies>
+ <suggests>
+ <dep package="enchant"/>
+ <dep package="geoclue"/>
+ <dep package="geocode-glib"/>
+ <dep package="iso-codes"/>
+ <dep package="libchamplain"/>
+ <if condition-set="linux">
+ <dep package="NetworkManager"/>
+ <dep package="gudev"/>
+ </if>
+ </suggests>
+ </autotools>
+
+ <autotools id="eog">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gdk-pixbuf"/>
+ <dep package="gtk+"/>
+ <dep package="gnome-desktop"/>
+ <dep package="gobject-introspection"/>
+ <dep package="gsettings-desktop-schemas"/>
+ <dep package="libjpeg"/>
+ <dep package="libpeas"/>
+ <dep package="libxml2"/>
+ <dep package="shared-mime-info"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ <suggests>
+ <dep package="exempi"/>
+ <dep package="libexif"/>
+ <dep package="lcms2"/>
+ <dep package="librsvg"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="epiphany">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="iso-codes"/>
+ <dep package="gtk+"/>
+ <dep package="startup-notification"/>
+ <dep package="WebKit"/>
+ <dep package="gcr"/>
+ <dep package="avahi"/>
+ <dep package="gnome-desktop"/>
+ <dep package="libwnck"/>
+ <dep package="libsecret"/>
+ <dep package="libsoup"/>
+ </dependencies>
+ <suggests>
+ <dep package="enchant"/>
+ <dep package="libnotify"/>
+ <dep package="libcanberra"/>
+ <dep package="nss"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="evince" autogenargs="--enable-introspection"
+ supports-parallel-builds="no">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="libxml2"/>
+ <dep package="adwaita-icon-theme"/>
+ <dep package="libsecret"/>
+ <dep package="poppler"/>
+ <dep package="nautilus"/>
+ <dep package="libgxps"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ <suggests>
+ <dep package="libsecret"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="gtksourceview"/>
+ <dep package="libxml2"/>
+ <dep package="vala"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-contacts">
+ <branch/>
+ <dependencies>
+ <dep package="folks"/>
+ <dep package="glib"/>
+ <dep package="gnome-desktop"/>
+ <dep package="gnome-online-accounts"/>
+ <dep package="gtk+"/>
+ <dep package="libgee"/>
+ <dep package="libnotify"/>
+ <dep package="telepathy-glib"/>
+ <dep package="vala"/>
+ </dependencies>
+ <suggests>
+ <dep package="cheese"/>
+ <dep package="gstreamer"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="gnome-dictionary">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-disk-utility">
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gnome-settings-daemon"/>
+ <dep package="gtk+"/>
+ <dep package="libnotify"/>
+ <dep package="libpwquality"/>
+ <dep package="libsecret"/>
+ <dep package="udisks"/>
+ <dep package="dvdread"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-font-viewer">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gnome-desktop"/>
+ <dep package="gtk+"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-screenshot">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-system-log">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-system-monitor">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="libwnck"/>
+ <dep package="libgtop"/>
+ <dep package="gtk+"/>
+ <dep package="gtkmm"/>
+ <dep package="libxml2"/>
+ <dep package="librsvg"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnome-terminal" autogenargs="--disable-migration">
+ <branch/>
+ <dependencies>
+ <dep package="dconf"/>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="gsettings-desktop-schemas"/>
+ <dep package="libuuid"/>
+ <dep package="vte"/>
+ <dep package="yelp-tools"/>
+ <dep package="nautilus"/>
+ <dep package="appdata-tools"/>
+ </dependencies>
+ <suggests>
+ <dep package="gnome-shell"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="gucharmap">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="nautilus">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="pango"/>
+ <dep package="libnotify"/>
+ <dep package="libxml2"/>
+ <dep package="gnome-desktop"/>
+ <dep package="gsettings-desktop-schemas"/>
+ <dep package="tracker"/>
+ <dep package="exempi"/>
+ <dep package="libexif"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="sushi">
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="gobject-introspection"/>
+ <dep package="gjs"/>
+ <dep package="libmusicbrainz"/>
+ <dep package="evince"/>
+ <dep package="clutter"/>
+ <dep package="clutter-gtk"/>
+ <dep package="clutter-gst"/>
+ <dep package="gtksourceview"/>
+ <dep package="WebKit1"/>
+ <dep package="gstreamer"/>
+ <dep package="gst-plugins-base"/>
+ <dep package="gtk+"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="totem">
+ <branch/>
+ <dependencies>
+ <dep package="appdata-tools"/>
+ <dep package="cairo"/>
+ <dep package="clutter"/>
+ <dep package="clutter-gst"/>
+ <dep package="clutter-gtk"/>
+ <dep package="gdk-pixbuf"/>
+ <dep package="glib"/>
+ <dep package="grilo"/>
+ <dep package="grilo-plugins"/>
+ <dep package="gsettings-desktop-schemas"/>
+ <dep package="gstreamer"/>
+ <dep package="gst-plugins-base"/>
+ <dep package="gst-plugins-good"/>
+ <dep package="gst-plugins-bad"/>
+ <dep package="gtk+"/>
+ <dep package="intltool"/>
+ <dep package="iso-codes"/>
+ <dep package="libpeas"/>
+ <dep package="totem-pl-parser"/>
+ <dep package="yelp-tools"/>
+ </dependencies>
+ <suggests>
+ <dep package="zeitgeist"/>
+ </suggests>
+ </autotools>
+
+ <autotools id="yelp">
+ <if condition-set="freebsd">
+ <autogenargs value="YELP_LZMA_CFLAGS=' ' YELP_LZMA_LIBS='-llzma'"/>
+ </if>
+ <branch/>
+ <dependencies>
+ <dep package="intltool"/>
+ <dep package="glib"/>
+ <dep package="gtk+"/>
+ <dep package="libxml2"/>
+ <dep package="libxslt"/>
+ <dep package="WebKit1"/>
+ <dep package="yelp-xsl"/>
+ </dependencies>
+ </autotools>
+
+</moduleset>
diff --git a/modulesets/gnome-meta-3.16.modules b/modulesets/gnome-meta-3.16.modules
index 8e6d533..4f8fd8d 100644
--- a/modulesets/gnome-meta-3.16.modules
+++ b/modulesets/gnome-meta-3.16.modules
@@ -5,6 +5,7 @@
<moduleset>
<include href="gnome-apps-3.16.modules"/>
+ <include href="gnome-core-apps-3.16.modules"/>
<include href="gnome-core-3.16.modules"/>
<!-- Meta Modules -->
@@ -67,10 +68,10 @@
</dependencies>
</metamodule>
- <!-- The Core GNOME Utilities: Only unbranded, GNOME integrated
- basic functionality utilities allowed
+ <!-- The GNOME Core Apps: Only unbranded, GNOME integrated
+ apps allowed
-->
- <metamodule id="meta-gnome-core-utilities">
+ <metamodule id="meta-gnome-core-apps">
<dependencies>
<dep package="baobab"/>
<dep package="empathy"/>
@@ -158,13 +159,13 @@
</dependencies>
</metamodule>
- <!-- The entirety of the Core GNOME UX, including extras and utilities
+ <!-- The entirety of the Core GNOME UX, including extras and core-apps
-->
<metamodule id="meta-gnome-core">
<dependencies>
<dep package="meta-gnome-core-shell"/>
<dep package="meta-gnome-core-extras"/>
- <dep package="meta-gnome-core-utilities"/>
+ <dep package="meta-gnome-core-apps"/>
<dep package="gnome-shell-extensions"/>
</dependencies>
</metamodule>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]