Merge ~khurshid-alam/ubuntu/+source/ubuntu-settings:terminal-headerbar into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

[Khurshid Alam]

Do not use headerbar for gnome-terminal under Unity. Fixes LP: #1815479

[Alberts Muktupāvels (muktupavels)]

Should not Unity specific overrides be moved to unity source package?

[Khurshid Alam (khurshid-alam)]

No. It should move into unity-settings (https://code.launchpad.net/unity-settings), but my request to upload that was denied and I was asked to work with ubuntu-settings instead.

[Alberts Muktupāvels (muktupavels)]

I don't see any need for extra / new package for settings...

Unity settings/overrides are needed only if Unity is installed so it makes perfect sense if unity-settings.gsettings-override is provided / installed by unity.

Anyway I was just only sharing my opinion. :)

[Khurshid Alam (khurshid-alam)]

@muktupavels

It's not just gsettings but other things like different lightdm user name on iso, mime-types, overrides in /etc, /use/share etc and unity itself may not be the right place for all of it. That's what other desktop-sessions does, mate has mate-session, budgie has lots tweaks & overrides (https://github.com/UbuntuBudgie/budgie-desktop-environment). I actually created that package because Budgie-dev and Martin Wimpress recommended such.

[Didier Roche-Tolomelli (didrocks)]

LGTM, merging, thanks!

review: Approve

diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override
index 38f336d..fdfef4b 100644
--- a/debian/ubuntu-settings.gsettings-override
+++ b/debian/ubuntu-settings.gsettings-override
@@ -189,6 +189,9 @@ active = true
 [org.gnome.settings-daemon.plugins.media-keys:Unity]
 screensaver = '<Control><Alt>l'
 
+[org.gnome.Terminal.Legacy.Settings:Unity]
+headerbar = false
+
 #############################################
 # communitheme specific session for testers #
 #############################################