remove help

2017.1/aims-desktop-2017/conf/gsettings/95_aims-desktop.gschema.override

@@ -4,7 +4,7 @@ enabled-extensions=['dash-to-dock@micxgx.gmail.com', 'disconnect-wifi@kgshank.ne
 # Disable extension version verification
 disable-extension-version-validation=true
 # Launcher icons
-favorite-apps=['firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'sagemath-aims.desktop', 'jupyter-aims.desktop', 'spyder3.desktop', 'texstudio.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'gnome-calculator.desktop', 'com.gexperts.Terminix.desktop', 'gnome-system-monitor.desktop', 'gnome-tweak-tool.desktop', 'gnome-control-center.desktop', 'yelp.desktop', 'org.gnome.Software.desktop']
+favorite-apps=['firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'sagemath-aims.desktop', 'jupyter-aims.desktop', 'spyder3.desktop', 'texstudio.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'gnome-calculator.desktop', 'com.gexperts.Terminix.desktop', 'gnome-system-monitor.desktop', 'gnome-tweak-tool.desktop', 'gnome-control-center.desktop', 'org.gnome.Software.desktop']
 
 # Gnome shell overrides
 [org.gnome.shell.overrides]

2017.1/aims-desktop-2017/debian/changelog

+aims-desktop (2017.02.6) stretch; urgency=medium
+
+  * Remove gnome-getting-started-docs
+
+ -- Jonathan Carter <jcarter@linux.com>  Mon, 13 Feb 2017 13:19:09 +0200
+
 aims-desktop (2017.02.5) stretch; urgency=medium
 
   * Move terminix bell setting to the right place

2017.1/aims-desktop-2017/debian/control

@@ -11,6 +11,7 @@ Vcs-Browser: https://bitbucket.org/aims_za/aims-desktop-metapackages
 Package: aims-desktop
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: gnome-getting-started-docs
 Recommends: aims-artwork,
             aims-fonts,
             aims-keyring,
@@ -188,7 +189,7 @@ Recommends: aims-artwork,
             wireless-tools,
             youtube-dl,
             xserver-xorg-legacy
-Conflicts: sagemath-upstream-binary
+Conflicts: sagemath-upstream-binary, gnome-getting-started-docs
 Description: African Institute for Mathematical Sciences desktop metapackage
  This metapackage is used to install AIMS laptops and desktops with
  scientific software such as Jupyter, RStudio, Sage, Texmaker, and restricted

2017.1/aims-live-2017/conf/gsettings/96_aims-desktop-live.gschema.override

 # Launcher icons
 [org.gnome.shell]
-favorite-apps=['install-aims-desktop.desktop', 'firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'sagemath-aims.desktop', 'jupyter-aims.desktop', 'spyder3.desktop', 'texstudio.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'gnome-calculator.desktop', 'com.gexperts.Terminix.desktop', 'gnome-system-monitor.desktop', 'gnome-tweak-tool.desktop', 'gnome-control-center.desktop', 'yelp.desktop', 'org.gnome.Software.desktop', 'gparted.desktop']
+favorite-apps=['install-aims-desktop.desktop', 'firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'sagemath-aims.desktop', 'jupyter-aims.desktop', 'spyder3.desktop', 'texstudio.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'gnome-calculator.desktop', 'com.gexperts.Terminix.desktop', 'gnome-system-monitor.desktop', 'gnome-tweak-tool.desktop', 'gnome-control-center.desktop', 'org.gnome.Software.desktop', 'gparted.desktop']
 
 # Lockdown
 [org.gnome.desktop.lockdown]

2017.1/aims-live-2017/debian/changelog

+aims-live (2017.1.20170206.10) stretch; urgency=medium
+
+  * Remove yelp from launcher
+
+ -- Jonathan Carter <jcarter@linux.com>  Mon, 13 Feb 2017 13:21:38 +0200
+
+aims-live (2017.1.20170206.9) stretch; urgency=medium
+
+  * Fix conflict entries
+
+ -- Jonathan Carter <jcarter@linux.com>  Mon, 13 Feb 2017 12:03:36 +0200
+
 aims-live (2017.1.20170206.8) stretch; urgency=medium
 
   * Disable swap by default

2017.1/aims-live-2017/debian/control

@@ -23,33 +23,23 @@ Depends: calamares,
 Conflicts: antiword,
            catdoc,
            cython-doc,
-           default-mta,
            docbook-dsssl,
            docutils-doc,
            ecl-doc,
            fckeditor,
            fflas-ffpack-dev-doc,
            fflas-ffpack-user-doc,
-           gap-dev,
-           gap-doc,
-           gdb,
-           gdb-doc,
-           gdbserver,
            gmp-doc,
            httpd-cgi,
-           libapache2-mod-wsgi,
-           libcdd-doc,
            libgmp10-doc,
            libmpfi-doc,
            libmpfr-dev,
-           mail-transport-agent,
            mercurial,
            nauty-doc,
            pari-galpol,
            pari-gp2c,
            python-4suite-xml,
            python-attr-doc,
-           python-blinker,
            python-cairocffi,
            python-configobj,
            python-cycler-doc,
@@ -65,7 +55,6 @@ Conflicts: antiword,
            python-gdchart,
            python-genshi,
            python-glade2,
-           python-gmpy,
            python-greenlet,
            python-ldap,
            python-manuel,
@@ -78,10 +67,6 @@ Conflicts: antiword,
            python-pam,
            python-ply-doc,
            python-pydot,
-           python-pyglet,
-           python-pygraphviz,
-           python-pyicu,
-           python-pyinotify,
            python-pylibmc,
            python-pyparsing-doc,
            python-pyxmpp,
@@ -91,19 +76,14 @@ Conflicts: antiword,
            python-rpy-docs,
            python-scipy-doc,
            python-serial,
-           python-simplejson,
            python-sip,
            python-sphinx-rtd-theme,
            python-stemmer,
-           python-sympy-doc,
            python-traits,
            python-twisted-bin-dbg,
            python-werkzeug-doc,
            python-wxgtk3.0,
-           python-xapian,
-           python-xappy,
            python-xml,
-           python-yaml,
            python-zope.testing,
            sagetex-doc,
            singular-dev-doc,