[gnome-software] Reorganize modulesets with each moduleset category in its own file

[Kalev Lember <klember src gnome org>]

commit eb6ca699e3677ff9296c4aaa2f6b414bf77afcae
Author: Kalev Lember <kalevlember gmail com>
Date:   Wed Jun 17 15:30:37 2015 +0200

    Reorganize modulesets with each moduleset category in its own file
    
    This makes the moduleset xml files pass xmllint.

 data/modulesets/Makefile.am  |    7 ++-
 data/modulesets/base.xml     |    4 --
 data/modulesets/core.xml     |    6 +++
 data/modulesets/default.xml  |   63 ------------------------------
 data/modulesets/featured.xml |   86 ++++++++++++++++++++++++++++++++++++++++++
 data/modulesets/gnome.xml    |   79 --------------------------------------
 data/modulesets/popular.xml  |   18 +++++++++
 data/modulesets/system.xml   |   24 ++++++++++++
 8 files changed, 138 insertions(+), 149 deletions(-)
---
diff --git a/data/modulesets/Makefile.am b/data/modulesets/Makefile.am
index a721947..bb0fecd 100644
--- a/data/modulesets/Makefile.am
+++ b/data/modulesets/Makefile.am
@@ -1,7 +1,8 @@
 modulesetsdir = $(datadir)/gnome-software/modulesets.d
 dist_modulesets_DATA =                                 \
-       base.xml                                        \
-       default.xml                                     \
-       gnome.xml
+       core.xml                                        \
+       featured.xml                                    \
+       popular.xml                                     \
+       system.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/data/modulesets/core.xml b/data/modulesets/core.xml
new file mode 100644
index 0000000..6d4f617
--- /dev/null
+++ b/data/modulesets/core.xml
@@ -0,0 +1,6 @@
+<moduleset name="core">
+  <module type="pkgname">glib2</module>
+  <module type="pkgname">glibc</module>
+  <module type="pkgname">gtk3</module>
+  <module type="pkgname">kernel</module>
+</moduleset>
diff --git a/data/modulesets/featured.xml b/data/modulesets/featured.xml
new file mode 100644
index 0000000..2f11a5d
--- /dev/null
+++ b/data/modulesets/featured.xml
@@ -0,0 +1,86 @@
+<!-- Apps that show up as featured in their respective categories -->
+<moduleset name="featured">
+  <module type="application" category="Audio">ardour2.desktop</module>
+  <module type="application" category="Audio">audacity.desktop</module>
+  <module type="application" category="Audio">banshee.desktop</module>
+  <module type="application" category="Audio">brasero.desktop</module>
+  <module type="application" category="Audio">rhythmbox.desktop</module>
+  <module type="application" category="Audio">rosegarden.desktop</module>
+  <module type="application" category="Audio">sound-juicer.desktop</module>
+  <module type="application" category="Development">anjuta.desktop</module>
+  <module type="application" category="Development">devassistant.desktop</module>
+  <module type="application" category="Development">devhelp.desktop</module>
+  <module type="application" category="Development">d-feet.desktop</module>
+  <module type="application" category="Development">eclipse.desktop</module>
+  <module type="application" category="Development">gitg.desktop</module>
+  <module type="application" category="Development">glade.desktop</module>
+  <module type="application" category="Development">monodevelop.desktop</module>
+  <module type="application" category="Development">org.gnome.gedit.desktop</module>
+  <module type="application" category="Education">celestia.desktop</module>
+  <module type="application" category="Game">0ad.desktop</module>
+  <module type="application" category="Game">btanks.desktop</module>
+  <module type="application" category="Game">frozen-bubble.desktop</module>
+  <module type="application" category="Game">gnome-chess.desktop</module>
+  <module type="application" category="Game">gnome-mahjongg.desktop</module>
+  <module type="application" category="Game">gnome-mines.desktop</module>
+  <module type="application" category="Game">gnome-sudoku.desktop</module>
+  <module type="application" category="Game">gnome-tetravex.desktop</module>
+  <module type="application" category="Game">iagno.desktop</module>
+  <module type="application" category="Game">lightsoff.desktop</module>
+  <module type="application" category="Game">neverball.desktop</module>
+  <module type="application" category="Game">openarena.desktop</module>
+  <module type="application" category="Game">quadrapassel.desktop</module>
+  <module type="application" category="Game">redeclipse.desktop</module>
+  <module type="application" category="Game">sol.desktop</module>
+  <module type="application" category="Game">supertuxkart.desktop</module>
+  <module type="application" category="Game">swell-foop.desktop</module>
+  <module type="application" category="Game">tremulous.desktop</module>
+  <module type="application" category="Game">wesnoth.desktop</module>
+  <module type="application" category="Game">xonotic.desktop</module>
+  <module type="application" category="Graphics">blender.desktop</module>
+  <module type="application" category="Graphics">darktable.desktop</module>
+  <module type="application" category="Graphics">gimp.desktop</module>
+  <module type="application" category="Graphics">inkscape.desktop</module>
+  <module type="application" category="Graphics">libreoffice-draw.desktop</module>
+  <module type="application" category="Graphics">mypaint.desktop</module>
+  <module type="application" category="Graphics">org.gnome.font-viewer.desktop</module>
+  <module type="application" category="Graphics">scribus.desktop</module>
+  <module type="application" category="Graphics">shotwell.desktop</module>
+  <module type="application" category="Graphics">simple-scan.desktop</module>
+  <module type="application" category="Network">chromium-browser.desktop</module>
+  <module type="application" category="Network">epiphany.desktop</module>
+  <module type="application" category="Network">firefox.desktop</module>
+  <module type="application" category="Network">geary.desktop</module>
+  <module type="application" category="Network">mozilla-thunderbird.desktop</module>
+  <module type="application" category="Network">org.gnome.Polari.desktop</module>
+  <module type="application" category="Network">pidgin.desktop</module>
+  <module type="application" category="Network">transmission-gtk.desktop</module>
+  <module type="application" category="Network">vinagre.desktop</module>
+  <module type="application" category="Office">abiword.desktop</module>
+  <module type="application" category="Office">evolution.desktop</module>
+  <module type="application" category="Office">geary.desktop</module>
+  <module type="application" category="Office">gnucash.desktop</module>
+  <module type="application" category="Office">gnumeric.desktop</module>
+  <module type="application" category="Office">gramps.desktop</module>
+  <module type="application" category="Office">libreoffice-calc.desktop</module>
+  <module type="application" category="Office">libreoffice-impress.desktop</module>
+  <module type="application" category="Office">libreoffice-writer.desktop</module>
+  <module type="application" category="Office">lyx.desktop</module>
+  <module type="application" category="Science">octave.desktop</module>
+  <module type="application" category="Science">saoimage.desktop</module>
+  <module type="application" category="Science">stellarium.desktop</module>
+  <module type="application" category="System">gnome-disks.desktop</module>
+  <module type="application" category="System">gparted.desktop</module>
+  <module type="application" category="System">org.gnome.Boxes.desktop</module>
+  <module type="application" category="System">virt-manager.desktop</module>
+  <module type="application" category="Utility">bijiben.desktop</module>
+  <module type="application" category="Utility">org.gnome.clocks.desktop</module>
+  <module type="application" category="Utility">org.gnome.Documents.desktop</module>
+  <module type="application" category="Utility">org.gnome.Photos.desktop</module>
+  <module type="application" category="Utility">workrave.desktop</module>
+  <module type="application" category="Video">openshot.desktop</module>
+  <module type="application" category="Video">org.gnome.Cheese.desktop</module>
+  <module type="application" category="Video">org.gnome.Totem.desktop</module>
+  <module type="application" category="Video">pitivi.desktop</module>
+  <module type="application" category="Video">vlc.desktop</module>
+</moduleset>
diff --git a/data/modulesets/popular.xml b/data/modulesets/popular.xml
new file mode 100644
index 0000000..5ae8eda
--- /dev/null
+++ b/data/modulesets/popular.xml
@@ -0,0 +1,18 @@
+<!-- Apps for the "Editor's Picks" list -->
+<moduleset name="popular">
+  <module type="application">bijiben.desktop</module>
+  <module type="application">calibre-gui.desktop</module>
+  <module type="application">geary.desktop</module>
+  <module type="application">gnucash.desktop</module>
+  <module type="application">gtg.desktop</module>
+  <module type="application">inkscape.desktop</module>
+  <module type="application">mozilla-thunderbird.desktop</module>
+  <module type="application">musique.desktop</module>
+  <module type="application">org.gnome.Maps.desktop</module>
+  <module type="application">pdfmod.desktop</module>
+  <module type="application">scribus.desktop</module>
+  <module type="application">shutter.desktop</module>
+  <module type="application">simple-scan.desktop</module>
+  <module type="application">stellarium.desktop</module>
+  <module type="application">transmission-gtk.desktop</module>
+</moduleset>
diff --git a/data/modulesets/system.xml b/data/modulesets/system.xml
new file mode 100644
index 0000000..fae7fb4
--- /dev/null
+++ b/data/modulesets/system.xml
@@ -0,0 +1,24 @@
+<!-- Unremovable system apps -->
+<moduleset name="system">
+  <module type="application">empathy.desktop</module>
+  <module type="application">eog.desktop</module>
+  <module type="application">epiphany.desktop</module>
+  <module type="application">evince.desktop</module>
+  <module type="application">gnome-calculator.desktop</module>
+  <module type="application">gnome-control-center.desktop</module>
+  <module type="application">gnome-disks.desktop</module>
+  <module type="application">gnome-system-log.desktop</module>
+  <module type="application">gnome-system-monitor.desktop</module>
+  <module type="application">gnome-terminal.desktop</module>
+  <module type="application">gucharmap.desktop</module>
+  <module type="application">org.gnome.baobab.desktop</module>
+  <module type="application">org.gnome.Contacts.desktop</module>
+  <module type="application">org.gnome.Dictionary.desktop</module>
+  <module type="application">org.gnome.font-viewer.desktop</module>
+  <module type="application">org.gnome.gedit.desktop</module>
+  <module type="application">org.gnome.Nautilus.desktop</module>
+  <module type="application">org.gnome.Screenshot.desktop</module>
+  <module type="application">org.gnome.Software.desktop</module>
+  <module type="application">org.gnome.Totem.desktop</module>
+  <module type="application">yelp.desktop</module>
+</moduleset>