Merge branch 'master' of bitbucket.org:aims_za/aims-desktop-metapackages

2017.1/aims-desktop-2017/conf/gsettings/10_com.gexperts.Terminix.gschema.override

-[com.gexperts.Terminix.Settings]
+[com.gexperts.Tilix.Settings]
 warn-vte-config-issue=false
 theme-variant='dark'
 terminal-title-show-when-single=false
 terminal-title-style='small'
 
-[com.gexperts.Terminix.profiles.2b7c4080-0ddd-46c5-8f23-563fd3ba789d]
+[com.gexperts.Tilix.profiles.2b7c4080-0ddd-46c5-8f23-563fd3ba789d]
 background-color='#212121212121'
 default-size-columns='132'
 default-size-rows='36'

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

 # Desktop defaults
 [org.gnome.shell]
-enabled-extensions=['dash-to-dock@micxgx.gmail.com', 'disconnect-wifi@kgshank.net', 'Hide_Activities@shay.shayel.org', 'Move_Clock@jonathan.bluemosh.com', 'openweather-extension@jenslody.de', 'refresh-wifi@kgshank.net', 'remove-dropdown-arrows@mpdeimos.com', 'topIcons@kevinboxhoorn.yahoo.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'impatience@gfxmonk.net', 'gnome-shell-trash-extension', 'LogOutButton@kyle.aims.ac.za', 'Shortcuts@kyle.aims.ac.za', 'TopIcons@phocean.net', 'alternate-tab@gnome-shell-extensions.gcampax.github.com', 'TilixKeyboardShortcut@jonathan.bluemosh.com']
+enabled-extensions=['dash-to-dock@micxgx.gmail.com', 'disconnect-wifi@kgshank.net', 'Hide_Activities@shay.shayel.org', 'Move_Clock@jonathan.bluemosh.com', 'openweather-extension@jenslody.de', 'refresh-wifi@kgshank.net', 'remove-dropdown-arrows@mpdeimos.com', 'topIcons@kevinboxhoorn.yahoo.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'impatience@gfxmonk.net', 'gnome-shell-trash-extension', 'LogOutButton@kyle.aims.ac.za', 'Shortcuts@kyle.aims.ac.za', 'TopIcons@phocean.net', 'alternate-tab@gnome-shell-extensions.gcampax.github.com', 'TilixKeyboardShortcut@jonathan.bluemosh.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com']
 # 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', '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.Tilix.desktop', 'gnome-system-monitor.desktop', 'gnome-tweak-tool.desktop', 'gnome-control-center.desktop', 'org.gnome.Software.desktop']
 
 # Gnome shell overrides
 [org.gnome.shell.overrides]
@@ -98,7 +98,7 @@ custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybin
 [org.gnome.settings-daemon.plugins.media-keys.custom-keybindings.aimscustom0]
 binding='<Primary><Alt>t'
 command='terminix'
-name='Terminix'
+name='Tilix'
 
 [org.gnome.desktop.peripherals.touchpad]
 natural-scroll=false

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

@@ -9,3 +9,4 @@ icon-size-fixed=true
 dash-max-icon-size=32
 isolate-workspaces=true
 dock-fixed=true
+scroll-action='switch-workspace'

2017.1/aims-desktop-2017/debian/changelog

+aims-desktop (2017.05.32) stretch; urgency=medium
+
+  * Enable dash-to-dock scroll action
+
+ -- Jonathan Carter <jcarter@linux.com>  Wed, 31 May 2017 11:39:30 +0200
+
+aims-desktop (2017.05.31) stretch; urgency=medium
+
+  * Enable removable drive menu by default
+
+ -- Jonathan Carter <jcarter@linux.com>  Wed, 31 May 2017 11:34:42 +0200
+
+aims-desktop (2017.05.30) stretch; urgency=medium
+
+  * Account for terminix/tilix name change in gsettings.
+
+ -- Jonathan Carter <jcarter@linux.com>  Tue, 30 May 2017 11:23:47 +0200
+
 aims-desktop (2017.05.05) stretch; urgency=medium
 
   * Depending on tilix before terminix

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', '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.Tilix.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.20170531.1) stretch; urgency=medium
+
+  * Update Tilix entry in live session
+
+ -- Jonathan Carter <jcarter@linux.com>  Wed, 31 May 2017 08:45:50 +0200
+
 aims-live (2017.1.20170426.1) stretch; urgency=medium
 
   * Conflict with cups-browsed which uses 100% CPU in some cases