diff -Nru ubuntu-mate-settings-16.04.2/debian/changelog ubuntu-mate-settings-16.04.3/debian/changelog --- ubuntu-mate-settings-16.04.2/debian/changelog 2016-02-21 18:16:14.000000000 +0000 +++ ubuntu-mate-settings-16.04.3/debian/changelog 2016-03-02 15:34:36.000000000 +0000 @@ -1,3 +1,13 @@ +ubuntu-mate-settings (16.04.3) xenial; urgency=medium + + * Added migration for incorrect ~/.xinputrc. See LP: #1550325 + * Added sensible Synapse interface defaults. + * Migrated Plank configuration to gsettings, required by the new + version of Plank. + * Closes (LP: #1552283) + + -- Martin Wimpress Fri, 26 Feb 2016 13:27:27 +0000 + ubuntu-mate-settings (16.04.2) xenial; urgency=medium * Add support for topmenu-gtk. diff -Nru ubuntu-mate-settings-16.04.2/debian/control ubuntu-mate-settings-16.04.3/debian/control --- ubuntu-mate-settings-16.04.2/debian/control 2015-12-13 15:17:44.000000000 +0000 +++ ubuntu-mate-settings-16.04.3/debian/control 2016-02-26 14:21:50.000000000 +0000 @@ -11,6 +11,7 @@ Package: ubuntu-mate-default-settings Architecture: all Depends: desktop-file-utils, + im-config, libglib2.0-bin, mate-panel, ttf-ubuntu-font-family, diff -Nru ubuntu-mate-settings-16.04.2/usr/lib/ubuntu-mate/ubuntu-mate-settings-overlay ubuntu-mate-settings-16.04.3/usr/lib/ubuntu-mate/ubuntu-mate-settings-overlay --- ubuntu-mate-settings-16.04.2/usr/lib/ubuntu-mate/ubuntu-mate-settings-overlay 2016-01-22 09:34:08.000000000 +0000 +++ ubuntu-mate-settings-16.04.3/usr/lib/ubuntu-mate/ubuntu-mate-settings-overlay 2016-03-02 14:41:04.000000000 +0000 @@ -10,17 +10,20 @@ fi } -if [ ! -d "${HOME}/.config/plank/dock1" ]; then - overlay_file config/plank/dock1/settings - overlay_file config/plank/dock1/launchers/firefox.dockitem - overlay_file config/plank/dock1/launchers/matecc.dockitem - if [ -f /usr/bin/thunderbird ]; then - overlay_file config/plank/dock1/launchers/thunderbird.dockitem +# If the 'xim' input method is set, probably by gnome-language-selector, +# this causes all manner of compatibility issues. This is a work around +# for pre-existing configurations, a patch has been submitted upstream. +# - https://bugs.launchpad.net/language-selector/+bug/1550325 +function correct_xinputrc() { + DETECT_XIM=$(grep xim ${HOME}/.xinputrc) + if [ $? -eq 0 ]; then + AUTO=$(im-config -m | sed '3q;d') + /usr/bin/im-config -n ${AUTO} fi - if [ -f /usr/bin/vlc ]; then - overlay_file config/plank/dock1/launchers/vlc.dockitem - fi -fi +} + overlay_file config/folder-color/hide_donation overlay_file config/libreoffice/4/user/registrymodifications.xcu +overlay_file config/synapse/config.json overlay_file config/Trolltech.conf +correct_xinputrc \ No newline at end of file diff -Nru ubuntu-mate-settings-16.04.2/usr/share/glib-2.0/schemas/ubuntu-mate.gschema.override ubuntu-mate-settings-16.04.3/usr/share/glib-2.0/schemas/ubuntu-mate.gschema.override --- ubuntu-mate-settings-16.04.2/usr/share/glib-2.0/schemas/ubuntu-mate.gschema.override 2016-01-22 09:34:08.000000000 +0000 +++ ubuntu-mate-settings-16.04.3/usr/share/glib-2.0/schemas/ubuntu-mate.gschema.override 2016-02-26 14:36:54.000000000 +0000 @@ -2,6 +2,10 @@ show-details=true show-versions=true +[net.launchpad.plank.dock.settings] +dock-items=['desktop.dockitem', 'clock.dockitem', 'firefox.dockitem', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'matecc.dockitem'] +hide-mode='window-dodge' + [org.gnome.crypto.pgp] keyservers=['hkp://keyserver.ubuntu.com:11371', 'hkp://pool.sks-keyservers.net', 'ldap://keyserver.pgp.com'] @@ -161,4 +165,4 @@ use-system-font=true [org.yorba.shotwell.printing] -titles-font='Ubuntu Bold 12' +titles-font='Ubuntu Bold 12' \ No newline at end of file diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/firefox.dockitem ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/firefox.dockitem --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/firefox.dockitem 2015-06-08 11:18:05.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/firefox.dockitem 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[PlankItemsDockItemPreferences] -Launcher=file:///usr/share/applications/firefox.desktop diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/matecc.dockitem ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/matecc.dockitem --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/matecc.dockitem 2015-06-08 11:18:05.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/matecc.dockitem 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[PlankItemsDockItemPreferences] -Launcher=file:///usr/share/applications/matecc.desktop diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/thunderbird.dockitem ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/thunderbird.dockitem --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/thunderbird.dockitem 2015-06-08 11:18:05.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/thunderbird.dockitem 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[PlankItemsDockItemPreferences] -Launcher=file:///usr/share/applications/thunderbird.desktop diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/vlc.dockitem ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/vlc.dockitem --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/vlc.dockitem 2015-06-08 11:18:05.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/launchers/vlc.dockitem 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[PlankItemsDockItemPreferences] -Launcher=file:///usr/share/applications/vlc.desktop diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/settings ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/settings --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/settings 2015-09-22 13:30:31.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/plank/dock1/settings 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#This file auto-generated by Plank. -#2015-04-24T12:14:46+0000 - -[PlankDockPreferences] -#Whether to show only windows of the current workspace. -CurrentWorkspaceOnly=false -#The size of dock icons (in pixels). -IconSize=48 -#If 0, the dock won't hide. If 1, the dock intelligently hides. If 2, the dock auto-hides. If 3, the dock dodges active maximized windows. If 4, the dock dodges every window. -HideMode=1 -#Time (in ms) to wait before unhiding the dock. -UnhideDelay=0 -#Time (in ms) to wait before hiding the dock. -HideDelay=0 -#The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, LVDS1). Leave this empty to keep on the primary monitor. -Monitor= -#List of *.dockitem files on this dock. DO NOT MODIFY -DockItems=firefox.dockitem;;thunderbird.dockitem;;vlc.dockitem;;matecc.dockitem -#The position for the dock on the monitor. If 0, left. If 1, right. If 2, top. If 3, bottom. -Position=3 -#The dock's position offset from center (in percent). -Offset=0 -#The name of the dock's theme to use. -Theme=Gtk+ -#The alignment for the dock on the monitor's edge. If 0, panel-mode. If 1, left-aligned. If 2, right-aligned. If 3, centered. -Alignment=3 -#The alignment of the items in this dock if panel-mode is used. If 1, left-aligned. If 2, right-aligned. If 3, centered. -ItemsAlignment=3 -#Whether to prevent drag'n'drop actions and lock items on the dock. -LockItems=false -#Whether to use pressure-based revealing of the dock if the support is available. -PressureReveal=false -#Whether to show only pinned applications. Useful for running more then one dock. -PinnedOnly=false -#Whether to automatically pin an application if it seems useful to do. -AutoPinning=true diff -Nru ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/synapse/config.json ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/synapse/config.json --- ubuntu-mate-settings-16.04.2/usr/share/ubuntu-mate/settings-overlay/config/synapse/config.json 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-mate-settings-16.04.3/usr/share/ubuntu-mate/settings-overlay/config/synapse/config.json 2016-03-02 14:42:50.000000000 +0000 @@ -0,0 +1,7 @@ +{ + "ui" : { + "global" : { + "ui-type" : "side-doish" + } + } +}