[releng] Revert "3.26: gitg must not suggest glade"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b8862313d2500ee305f0b452417011f57cc506bd
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Fri Aug 11 11:02:01 2017 -0500

    Revert "3.26: gitg must not suggest glade"
    
    This reverts commit 7f044ce1c7eb78f9cc6929d618735772b91363b8.
    
    Wrong terminal ;)

 tools/smoketesting/sample-tarball.jhbuildrc  |    4 ++--
 tools/smoketesting/tarball-conversion.config |   16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/tools/smoketesting/sample-tarball.jhbuildrc b/tools/smoketesting/sample-tarball.jhbuildrc
index 5031abf..e1012ba 100644
--- a/tools/smoketesting/sample-tarball.jhbuildrc
+++ b/tools/smoketesting/sample-tarball.jhbuildrc
@@ -5,7 +5,7 @@
 
 # what moduleset should be used.
 use_local_modulesets = True
-moduleset = 'gnome-apps-3.25.90'
+moduleset = 'gnome-apps-3.25.4'
 
 # A list of the modules to build.  Defaults to the Gnome Desktop and
 # developer platform.
@@ -20,4 +20,4 @@ checkoutroot = os.path.join(os.environ['HOME'], 'releases', moduleset)
 # the prefix to configure/install modules to (must have write access)
 prefix = os.path.join(checkoutroot, 'install')
 
-#skip = ['glade', 'simple-scan']
+skip = ['pango', 'at-spi2-atk', 'vte', 'gdm', 'clutter-gtk', 'graphene', 'nautilus', 'glade', 'libgxps', 
'libgepub', 'gnome-font-viewer', 'fwupd', 'gnome-terminal', 'totem', 'simple-scan', 'usbredir', 'spice-gtk', 
'gst-plugins-base', 'gst-plugins-bad', 'gnome-dictionary', 'nautilus-sendto', 'gnome-builder', 'gnome-chess', 
'gnome-sudoku']
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index 21643ed..1ba06cb 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -10,17 +10,13 @@
       subdir="$module/releases/"
       />
 
-    <site module="ModemManager"              location="http://www.freedesktop.org/software/ModemManager/"/>
-    <site module="PackageKit"                
location="http://www.freedesktop.org/software/PackageKit/releases/"/>
     <site module="accountsservice"           
location="http://www.freedesktop.org/software/accountsservice/"/>
     <site module="appstream-glib"            
location="http://people.freedesktop.org/~hughsient/appstream-glib/releases/"/>
-    <site module="babl"                      location="http://ftp.gimp.org/pub/babl/"/>
     <site module="cairo"                     location="http://cairographics.org/releases/"/>
     <site module="colord"                    
location="http://www.freedesktop.org/software/colord/releases/"/>
     <site module="colord-gtk"                
location="http://www.freedesktop.org/software/colord/releases/"/>
     <site module="fontconfig"                
location="http://www.freedesktop.org/software/fontconfig/release/"/>
     <site module="fwupd"                     location="http://people.freedesktop.org/~hughsient/releases/"/>
-    <site module="gegl"                      location="http://ftp.gimp.org/pub/gegl/"/>
     <site module="geoclue"                   
location="http://www.freedesktop.org/software/geoclue/releases/2.4/"/>
     <site module="gstreamer"                 location="http://gstreamer.freedesktop.org/src/gstreamer/"/>
     <site module="gst-plugins-bad"           
location="http://gstreamer.freedesktop.org/src/gst-plugins-bad/"/>
@@ -32,20 +28,24 @@
     <site module="libinput"                  location="http://www.freedesktop.org/software/libinput/"/>
     <site module="libmbim"                   location="http://www.freedesktop.org/software/libmbim/"/>
     <site module="libosinfo"                 location="https://releases.pagure.org/libosinfo/"/>
+    <site module="osinfo-db-tools"           location="https://releases.pagure.org/libosinfo/"/>
     <site module="libqmi"                    location="http://www.freedesktop.org/software/libqmi/"/>
     <site module="libvirt-glib"              location="ftp://libvirt.org/libvirt/glib/"/>
     <site module="libxkbcommon"              location="http://xkbcommon.org/download/"/>
-    <site module="osinfo-db-tools"           location="https://releases.pagure.org/libosinfo/"/>
+    <site module="ModemManager"              location="http://www.freedesktop.org/software/ModemManager/"/>
+    <site module="PackageKit"                
location="http://www.freedesktop.org/software/PackageKit/releases/"/>
     <site module="pulseaudio"                
location="http://www.freedesktop.org/software/pulseaudio/releases/"/>
     <site module="telepathy-farstream"       location="http://telepathy.freedesktop.org/releases/"; 
subdir="$module"/>
     <site module="telepathy-glib"            location="http://telepathy.freedesktop.org/releases/"; 
subdir="$module"/>
     <site module="telepathy-logger"          location="http://telepathy.freedesktop.org/releases/"; 
subdir="$module"/>
     <site module="telepathy-mission-control" location="http://telepathy.freedesktop.org/releases/"; 
subdir="$module"/>
     <site module="udisks"                    location="http://udisks.freedesktop.org/releases/"; />
-    <site module="uhttpmock"                 location="http://tecnocode.co.uk/downloads/uhttpmock/"/>
     <site module="upower"                    location="http://upower.freedesktop.org/releases/"; />
     <site module="wayland"                   location="http://wayland.freedesktop.org/releases/"; />
     <site module="wayland-protocols"         location="http://wayland.freedesktop.org/releases/"; />
+    <site module="gegl"                      location="http://ftp.gimp.org/pub/gegl/"/>
+    <site module="babl"                      location="http://ftp.gimp.org/pub/babl/"/>
+    <site module="uhttpmock"                 location="http://tecnocode.co.uk/downloads/uhttpmock/"/>
   </locations>
   <mirrors>
     <mirror location="https://download.gnome.org/"; alternate="file:///ftp/pub/GNOME/" 
host="window.gnome.org" />
@@ -250,7 +250,6 @@
     <package name="pyatspi"                     set="core"/>
     <package name="totem-pl-parser"             set="core"/>
     <package name="tracker"                     set="core"/>
-    <package name="tracker-miners"              set="core"/>
     <package name="vala"                        set="core"/>
     <package name="vte"                         set="core"/>
     <package name="yelp-xsl"                    set="core"/>
@@ -262,11 +261,13 @@
     <package name="aisleriot"                   set="apps"/>
     <package name="dconf-editor"                set="apps"/>
     <package name="devhelp"                     set="apps"/>
+    <package name="empathy"                     set="apps"/>
     <package name="evolution"                   set="apps"/>
     <package name="five-or-more"                set="apps"/>
     <package name="four-in-a-row"               set="apps"/>
     <package name="ghex"                        set="apps"/>
     <package name="gitg"                        set="apps"/>
+    <package name="glade"                       set="apps"/>
     <package name="gnome-builder"               set="apps"/>
     <package name="gnome-chess"                 set="apps"/>
     <package name="gnome-devel-docs"            set="apps"/>
@@ -292,6 +293,7 @@
     <package name="quadrapassel"                set="apps"/>
     <package name="gnome-recipes"               set="apps"/>
     <package name="rygel"                       set="apps"/>
+    <package name="seahorse"                    set="apps"/>
     <package name="swell-foop"                  set="apps"/>
     <package name="tali"                        set="apps"/>