Simon McVittie · Simon McVittie · Simon McVittie · Simon McVittie · Simon McVittie · Simon McVittie
--- 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/debian/changelog
+++ b/debian/changelog
+gdm3 (3.38.1-2) unstable; urgency=medium
+
+  * debian/gdm3.preinst: Add script to replace possibly wrong .conf file.
+    In gdm3 versions of the 3.38 series a regression was introduced causing
+    the /usr/libexec/gdm-disable-wayland tool to write its supposedly
+    temporary gdm file to the persistent location.
+    This is particularly harmful for users of the NVIDIA drivers as they
+    will get their default config file (/etc/gdm3/daemon.conf in debian and
+    /etc/gdm3/custom.conf in Ubuntu) modified for good, making impossible to
+    login in a Wayland session (once nvidia driver is disabled).
+    As per this, in case of upgrades or install with configuration files
+    left, we replace the gdm's daemon.conf/custom.conf file in case it
+    matches the one that the disable-wayland tool would produce.
+    https://discourse.gnome.org/t/gdm-3-38-0-has-bad-bug-for-nvidia-users/4517
+    (LP: #1899673)
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 14 Oct 2020 01:29:48 +0200
+
+gdm3 (3.38.1-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Fix bug leading to users /etc/gdm/custom.conf getting overwritten on
+      nvidia systems (LP: #1899673).
+    - Fix typo in comment
+    - Translation updates
+  * debian/rules: Don't override the runtime-conf path anymore.
+    Upstream fixed the root issue for changing this, so the default runtime
+    configuration file will be correctly written in the runtime path again.
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 13 Oct 2020 19:51:14 +0200
+
+gdm3 (3.38.0-2) unstable; urgency=medium
+
+  * Team upload
+  * d/rules: Set runtime configuration path.
+    In Autotools, the default runtime configuration path used to be
+    ${GDM_RUN_DIR}/custom.conf, but in the Meson build system the fallback
+    changed to be the same as the custom.conf path in /etc (set to
+    /etc/gdm3/daemon.conf in Debian for historical reasons).
+    Explicitly set it to the path we used before switching to Meson, so
+    that configuration changes by gdm-disable-wayland are temporary as
+    intended, and do not persist to a subsequent boot.
+  * Revert "debian/watch: Monitor unstable versions"
+  * d/upstream/metadata: Add
+  * Merge packaging from unstable
+  * Release to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 26 Sep 2020 16:52:06 +0100
+
 gdm3 (3.38.0-1ubuntu1) groovy; urgency=medium

  * Merge with debian, containing new upstream release:
@@ -211,6 +260,23 @@ gdm3 (3.37.90-1) experimental; urgency=medium

 -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 28 Aug 2020 22:37:09 +0200

+gdm3 (3.36.3-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - d/p/local-display-factory-always-force-login-screen-to-VT-1.patch:
+      Drop, applied upstream
+    - This version is functionally equivalent to 3.36.2-1
+  * Remove special case for s390x.
+    gjs and gnome-shell now exist there, so we no longer need to avoid
+    depending on them. In particular this makes the GNOME metapackages
+    installable on that architecture again. (Closes: #970245)
+  * d/gbp.conf: Switch branch for uploads to unstable.
+    3.37.x is already in experimental.
+  * d/watch: Only watch for 3.36.x versions
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 13 Sep 2020 18:05:02 +0100
+
 gdm3 (3.36.2-1) unstable; urgency=medium

  * Team upload

--- a/debian/gdm3.preinst
+++ b/debian/gdm3.preinst
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+  # Remove wrongly replaced custom.config file by versions > 3.37.90 && < 3.38.1
+  # This script can be safely removed post 20.10 release
+  prev_version="$2"
+  if dpkg --compare-versions "$prev_version" ge 3.37.90 &&
+     dpkg --compare-versions "$prev_version" lt-nl 3.38.1; then
+    conf_file=/etc/gdm3/daemon.conf
+    if [ "${prev_version#*ubuntu}" != "$prev_version" ]; then
+      conf_file=/etc/gdm3/custom.conf
+    fi
+
+    conf="${DPKG_ROOT}$conf_file"
+    if [ -f "$conf" ] &&
+       echo "ed0a2d19ba7344faa0feadd783bb4fa5 $conf" | md5sum -c --status; then
+      # If the file matches this checksum, then it's a file generated by
+      # /usr/libexec/gdm-disable-wayland that was wrongly replaced, so we
+      # replace the conf file to match the one that was default in these
+      # broken versions, so that dpkg would replace it in case.
+      echo "Configuration file $conf_file has likely been damaged by" \
+        "https://pad.lv/123456, replacing with the gdm default..."
+      cat <<'EOF' > "$conf"
+# GDM configuration storage
+#
+# See /usr/share/gdm/gdm.schemas for a list of available options.
+
+[daemon]
+# Uncomment the line below to force the login screen to use Xorg
+#WaylandEnable=false
+
+# Enabling automatic login
+#  AutomaticLoginEnable = true
+#  AutomaticLogin = user1
+
+# Enabling timed login
+#  TimedLoginEnable = true
+#  TimedLogin = user1
+#  TimedLoginDelay = 10
+
+[security]
+
+[xdmcp]
+
+[chooser]
+
+[debug]
+# Uncomment the line below to turn on debugging
+# More verbose logs
+# Additionally lets the X server dump core if it crashes
+#Enable=true
+
+EOF
+
+      # Verify that the file we've just added matches the default one
+      # We don't fail as it's not a fatal error, but will cause manual
+      # intervention at later points
+      default_md5sum="$(dpkg-query -W -f='${Conffiles}' gdm3 | \
+       sed -n -e "\\'^ $conf_file ' { s/ obsolete$//; s/.* //; p }")"
+      echo "$default_md5sum $conf" | md5sum -c --status ||
+        echo "Replaced configuration file isn't matching expected default"
+    fi
+  fi
+fi
+
+#DEBHELPER#
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
+Bug-Database: https://gitlab.gnome.org/GNOME/gdm/issues/
+Bug-Submit: https://gitlab.gnome.org/GNOME/gdm/issues/new
+Repository: https://gitlab.gnome.org/gnome/gdm.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/gdm/
--- a/debian/watch
+++ b/debian/watch
 version=4
-https://download.gnome.org/sources/gdm/([\d\.]+)/ \
+https://download.gnome.org/sources/gdm/([\d\.]+[02468])/ \
 	gdm@ANY_VERSION@\.tar\.xz
--- 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