Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master.
Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1787999 in ubuntu-settings (Ubuntu): "Yaru themes are not used in gdm by default" https://bugs.launchpad.net/ubuntu/+source/ubuntu-settings/+bug/1787999 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/353442 Reverted meson workaround, as it's fixed in https://bileto.ubuntu.com/#/ticket/3365 (please publish it) Using Yaru and other ubuntu-theming settings in GDM by default. The way we do is not ideal though as we override GNOME-Greeter mode, although I've already discussed with upstream (see below) a way to have us to be able to define in a file the session name so that it will be Ubuntu-Greeter:ubuntu even for pure gdm session, so we could then just change settings there and use a an alternative for those who want to use a vanilla gnome's GDM. --- 19:28:50 <halfline> hmm this might actually not be as invasive as i feared..skimming a bit, i think it's basically just changing the gdm_session_select_program call to gdm_session_select_session and installing the xsession files 19:29:26 <halfline> i mean then there's a whole bunch of if (self->priv->selected_program != NULL) code that doesn't get run anymore and can get deleted i suppose 19:30:46 <halfline> but yea it might actually just be 1) merge that merge request 2) install the xsession/wayland-session files 3) change selcet_program to select_session 4) change create_gnome_session_environment to take a session name instead of build a session command by hand 19:31:16 <halfline> i would try it right now but i'm busy hacking away in a VM on something else -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master.
diff --git a/debian/changelog b/debian/changelog index 1bd2323..92d29d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ubuntu-settings (18.10.2) UNRELEASED; urgency=medium + + * Remove workaround for meson bug #3914 as upstream fix is now in ubuntu + * debian/ubuntu-settings.gsettings-override: + - Set Yaru and Ubuntu fonts as default for GDM session (LP: #1787999) + + -- Marco Trevisan (Treviño) <ma...@ubuntu.com> Mon, 20 Aug 2018 17:04:22 +0200 + ubuntu-settings (18.10.1) cosmic; urgency=medium [ Iain Lane ] diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override index c5303d9..36afead 100644 --- a/debian/ubuntu-settings.gsettings-override +++ b/debian/ubuntu-settings.gsettings-override @@ -46,8 +46,13 @@ media-type-presets = {'audio/x-vorbis':'Ubuntu', 'audio/mpeg':'Ubuntu'} sleep-inactive-ac-timeout = 0 # for GDM/DM +# FIXME: move to :Ubuntu-Greeter once upstream supports this [org.gnome.desktop.interface:GNOME-Greeter] +gtk-theme = "Yaru" +icon-theme = "Yaru" cursor-theme = "Yaru" +font-name = "Ubuntu 11" +monospace-font-name = "Ubuntu Mono 13" [org.gnome.login-screen] logo='/usr/share/plymouth/ubuntu-logo.png' diff --git a/debian/ubuntu-settings.install b/debian/ubuntu-settings.install index dd0726a..7e32f86 100644 --- a/debian/ubuntu-settings.install +++ b/debian/ubuntu-settings.install @@ -1,2 +1,2 @@ usr/share/ubuntu -#usr/share/ubuntu-wayland +usr/share/ubuntu-wayland diff --git a/debian/ubuntu-settings.links b/debian/ubuntu-settings.links deleted file mode 100644 index 29df6de..0000000 --- a/debian/ubuntu-settings.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/ubuntu/applications/gnome-initial-setup.desktop usr/share/ubuntu-wayland/applications/gnome-initial-setup.desktop diff --git a/meson.build b/meson.build index 1a70ffa..fa830f6 100644 --- a/meson.build +++ b/meson.build @@ -19,8 +19,7 @@ i18n.merge_file(desktop_file, type: 'desktop' ) -#foreach dir : ['data/ubuntu-wayland', 'data/icons'] -foreach dir : ['data/icons'] +foreach dir : ['data/ubuntu-wayland', 'data/icons'] install_subdir(dir, install_dir: datadir) endforeach
-- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop