Yacine Bouklif · Felix Yan · Olav Vitters · Benjamin Berg · Iain Lane · Ray Strode
--- a/NEWS
+++ b/NEWS
+==============
+Version 3.38.1
+==============
+- Fix bug leading to users /etc/gdm/custom.conf getting overwritten on nvidia systems.
+- Fix typo in comment
+- Translation updates
+
 ==============
 Version 3.38.0
 ==============

--- a/daemon/gdm-x-session.c
+++ b/daemon/gdm-x-session.c
@@ -256,7 +256,7 @@ spawn_x_server (State        *state,
        g_ptr_array_add (arguments, auth_file);

        /* If we were compiled with Xserver >= 1.17 we need to specify
-         * '-listen tcp' as the X server dosen't listen on tcp sockets
+         * '-listen tcp' as the X server doesn't listen on tcp sockets
         * by default anymore. In older versions we need to pass
         * -nolisten tcp to disable listening on tcp sockets.
         */

--- a/meson.build
+++ b/meson.build
 project('gdm', 'c',
-  version: '3.38.0',
+  version: '3.38.1',
  license: 'GPL2+',
  meson_version: '>= 0.50',
 )
@@ -24,10 +24,10 @@ pam_mod_dir = (get_option('pam-mod-dir') != '')? get_option('pam-mod-dir') : gdm
 dbus_sys_dir = (get_option('dbus-sys') != '')? get_option('dbus-sys') : get_option('sysconfdir') / 'dbus-1' / 'system.d'
 gdm_defaults_conf = (get_option('defaults-conf') != '')? get_option('defaults-conf') : gdm_prefix / get_option('datadir') / 'gdm' / 'defaults.conf'
 gdm_custom_conf = (get_option('custom-conf') != '')? get_option('custom-conf') : gdmconfdir / 'custom.conf'
-gdm_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_custom_conf
 gnome_settings_daemon_dir = (get_option('gnome-settings-daemon-dir') != '')? get_option('gnome-settings-daemon-dir') : gdm_prefix / get_option('libexecdir')
 check_accelerated_dir = (get_option('check-accelerated-dir') != '')? get_option('check-accelerated-dir') : gdm_prefix / get_option('libexecdir')
 gdm_run_dir = (get_option('run-dir') != '')? get_option('run-dir') : gdm_prefix / get_option('localstatedir') / 'run' / 'gdm'
+gdm_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_run_dir / 'custom.conf'
 gdm_pid_file = (get_option('pid-file') != '')? get_option('pid-file') : gdm_run_dir / 'gdm.pid'
 ran_once_marker_dir = (get_option('ran-once-marker-dir') != '')? get_option('ran-once-marker-dir') : gdm_run_dir
 working_dir = (get_option('working-dir') != '')? get_option('working-dir') : gdm_prefix / get_option('localstatedir') / 'lib' / 'gdm'

--- a/po/kab.po
+++ b/po/kab.po