7 files changed, 197 insertions, 0 deletions
diff --git a/debian/patches/16_xserver_path.patch b/debian/patches/16_xserver_path.patch
new file mode 100644
index 0000000..317ed83
--- /dev/null
+++ b/debian/patches/16_xserver_path.patch
@@ -0,0 +1,29 @@
+From: Josselin Mouette <joss@debian.org>
+Date: Fri, 7 May 2010 21:42:02 +0200
+Subject: Use X_PATH and related environment variables when they exist
+
+Based on a patch by Julien Cristau.
+
+Origin: vendor, Debian
+Forwarded: no
+---
+ build-aux/find-x-server.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/build-aux/find-x-server.sh b/build-aux/find-x-server.sh
+index b5a8075..f48557e 100755
+--- a/build-aux/find-x-server.sh
++++ b/build-aux/find-x-server.sh
+@@ -11,7 +11,11 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/bin/X; then
++
++if test -n "$X_BIN"; then
++    # assume the user set these variables and don't second-guess them.
++    echo "$X_BIN"
++elif test -x /usr/bin/X; then
+     echo "/usr/bin/X"
+ elif test -x /usr/X11/bin/Xserver; then
+     echo "/usr/X11/bin/Xserver"
diff --git a/debian/patches/90_config_comments.patch b/debian/patches/90_config_comments.patch
new file mode 100644
index 0000000..15268bf
--- /dev/null
+++ b/debian/patches/90_config_comments.patch
@@ -0,0 +1,48 @@
+From: Josselin Mouette <joss@debian.org>
+Date: Wed, 6 Oct 2010 00:10:48 +0200
+Subject: Add some comments in the daemon.conf file to explain the available
+ options
+
+Thanks to Joey Hess.
+
+Last-Update: 2016-03-15 by Andreas Henriksson
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598666
+Origin: vendor, Debian
+Forwarded: no
+---
+ data/gdm.conf-custom.in | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/data/gdm.conf-custom.in b/data/gdm.conf-custom.in
+index 9b63ba9..b6ba63c 100644
+--- a/data/gdm.conf-custom.in
++++ b/data/gdm.conf-custom.in
+@@ -1,9 +1,20 @@
+ # 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]
+@@ -12,5 +23,7 @@
+ 
+ [debug]
+ # Uncomment the line below to turn on debugging
++# More verbose logs
++# Additionally lets the X server dump core if it crashes
+ #Enable=true
+ 
diff --git a/debian/patches/91_dconf_database_path.patch b/debian/patches/91_dconf_database_path.patch
new file mode 100644
index 0000000..f842a64
--- /dev/null
+++ b/debian/patches/91_dconf_database_path.patch
@@ -0,0 +1,19 @@
+From: Josselin Mouette <joss@debian.org>
+Date: Sat, 10 May 2014 22:52:23 +0200
+Subject: Point to a dconf path in /var/lib/gdm3 instead of the one in
+ $DATADIR
+
+Origin: vendor, Debian
+Forwarded: no
+---
+ data/dconf/gdm.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/dconf/gdm.in b/data/dconf/gdm.in
+index 4d8bf17..2118723 100644
+--- a/data/dconf/gdm.in
++++ b/data/dconf/gdm.in
+@@ -1,2 +1,2 @@
+ user-db:user
+-file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults
++file-db:/var/lib/gdm3/greeter-dconf-defaults
diff --git a/debian/patches/92_systemd_unit.patch b/debian/patches/92_systemd_unit.patch
new file mode 100644
index 0000000..5d6888c
--- /dev/null
+++ b/debian/patches/92_systemd_unit.patch
@@ -0,0 +1,42 @@
+From: Debian GNOME Maintainers
+ <pkg-gnome-maintainers@lists.alioth.debian.org>
+Date: Sat, 10 May 2014 22:52:23 +0200
+Subject: Configure systemd service for Debian
+
+* Regenerate dconf defaults from source files before start or reload
+* Use the right executable name for Debian
+* Delay restarts a little
+* Don't install the display-manager.service alias, which is managed
+  jointly by all Debian display managers via a debconf question
+
+Authors: Josselin Mouette, Laurent Bigonville, Iain Lane
+Last-Update: 2017-10-05
+Origin: vendor, Debian
+Forwarded: no
+---
+ data/gdm.service.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/data/gdm.service.in b/data/gdm.service.in
+index 17e8a8d..066d763 100644
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -20,14 +20,14 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service
+ OnFailure=plymouth-quit.service
+ 
+ [Service]
+-ExecStart=${sbindir}/gdm
++ExecStartPre=/usr/share/gdm/generate-config
++ExecStart=${sbindir}/gdm3
+ KillMode=mixed
+ Restart=always
++RestartSec=1s
+ IgnoreSIGPIPE=no
+ BusName=org.gnome.DisplayManager
+ EnvironmentFile=-${LANG_CONFIG_FILE}
++ExecReload=/usr/share/gdm/generate-config
+ ExecReload=/bin/kill -SIGHUP $MAINPID
+ KeyringMode=shared
+-
+-[Install]
+-Alias=display-manager.service
diff --git a/debian/patches/93_translate-default-desktop.patch b/debian/patches/93_translate-default-desktop.patch
new file mode 100644
index 0000000..86ae7ee
--- /dev/null
+++ b/debian/patches/93_translate-default-desktop.patch
@@ -0,0 +1,19 @@
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Sat, 4 Aug 2018 22:08:27 +0200
+Subject: Fix 'make check' in po/
+
+Forwarded: not-needed
+Origin: vendor, Debian
+---
+ po/POTFILES.skip | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 8b7f390..84c4f48 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -7,3 +7,4 @@
+ # remove these unless you fix "make distcheck" a different way.
+ #
+ data/gdm.schemas.in
++debian/default.desktop.in
diff --git a/debian/patches/94_retain_xorg_log.patch b/debian/patches/94_retain_xorg_log.patch
new file mode 100644
index 0000000..e3d99aa
--- /dev/null
+++ b/debian/patches/94_retain_xorg_log.patch
@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 8 Nov 2014 18:10:47 +0100
+Subject: reinstate Xorg.N.log at Xorg maintainers' request
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771
+Forwarded: no
+Origin: vendor, Debian
+---
+ daemon/gdm-server.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
+index 1ba00d4..d11d978 100644
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -235,12 +235,14 @@ gdm_server_init_command (GdmServer *server)
+          * missing, or c) we are running for the main seat 'seat0'. */
+ 
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+-        /* For systemd, we don't have a log file but instead log to stdout,
+-           so set it to the xserver's built-in default verbosity */
++        /* For systemd, we log to stdout (which is the Journal),
++           so set it to the same verbosity we use for -logverbose.
++           In Debian we want to log to Xorg.N.log in addition,
++           so we do not turn that off like GNOME upstream do. */
+         if (debug)
+-            verbosity = "7 -logfile /dev/null";
++            verbosity = "7";
+         else
+-            verbosity = "3 -logfile /dev/null";
++            verbosity = "3";
+ #endif
+ 
+         if (g_access (SYSTEMD_X_SERVER, X_OK) < 0) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3ecf1e1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+16_xserver_path.patch
+90_config_comments.patch
+91_dconf_database_path.patch
+92_systemd_unit.patch
+93_translate-default-desktop.patch
+94_retain_xorg_log.patch