r54268 - in /desktop/unstable/gdm3/debian: changelog patches/92_systemd_unit.patch

[bigon at users.alioth.debian.org]

Author: bigon
Date: Wed Oct  4 23:52:56 2017
New Revision: 54268

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54268
Log:
Drop the ExecStartPre= hack introduced to detect which DM is the default one,
almost all the other DM are properly providing the display-manager.service
symlink now

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=54268&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Wed Oct  4 23:52:56 2017
@@ -1,9 +1,13 @@
 gdm3 (3.26.1-3) UNRELEASED; urgency=medium
 
-  * debian/patches/92_systemd_unit.patch: Reorder the ExecReload= directive to
-    regenerate the config files before reloading gdm itself
-
- -- Laurent Bigonville <bigon at debian.org>  Thu, 05 Oct 2017 01:46:24 +0200
+  * debian/patches/92_systemd_unit.patch:
+    - Reorder the ExecReload= directive to regenerate the config files before
+      reloading gdm itself
+    - Drop the ExecStartPre= hack introduced to detect which DM is the default
+      one, almost all the other DM are properly providing the
+      display-manager.service symlink now
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 05 Oct 2017 01:51:47 +0200
 
 gdm3 (3.26.1-2) unstable; urgency=medium
 

Modified: desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch?rev=54268&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch	[utf-8] Wed Oct  4 23:52:56 2017
@@ -1,11 +1,10 @@
 --- a/data/gdm.service.in
 +++ b/data/gdm.service.in
-@@ -20,15 +20,16 @@ After=rc-local.service plymouth-start.se
+@@ -20,15 +20,15 @@ After=rc-local.service plymouth-start.se
  OnFailure=plymouth-quit.service
  
  [Service]
 -ExecStart=@sbindir@/gdm
-+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/gdm3" ]'
 +ExecStartPre=/usr/share/gdm/generate-config
 +ExecStart=@sbindir@/gdm3
  KillMode=mixed