[X2Go-Commits] [x2gothinclient] 01/02: minidesktop: Provide LightDM config adaptations in Debian policy conformant location(s).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 802a88003f59a85243490e86c1f940c15a73264f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 9 09:32:52 2020 +0100

    minidesktop: Provide LightDM config adaptations in Debian policy conformant location(s).
---
 debian/changelog                                   |  2 ++
 debian/x2gothinclient-minidesktop.install          |  3 ++-
 .../61-x2gothinclient-minidesktop.conf             | 22 ++++++++++++++++++++++
 .../60-x2gothinclient-minidesktop.conf}            |  0
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eb36aa2..cf1ed74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gothinclient (1.5.0.2-0x2go1) UNRELEASED; urgency=medium
     - management/share/etc/x2gothinclient-displaymanager_start: Fix filename
       given to --background cmdline option. Spotted by Wolfgang Schweer
       (see Debian bug #947618).
+    - minidesktop: Provide LightDM config adaptations in Debian policy
+      conformant location(s).
   * debian/control:
     + Add Ds (minidesktop): alsa-tools, pulseaudio, pavucontrol.
   * debian/x2gothinclient-minidesktop.postrm:
diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install
index 27b6033..721a9d5 100644
--- a/debian/x2gothinclient-minidesktop.install
+++ b/debian/x2gothinclient-minidesktop.install
@@ -1,7 +1,8 @@
 management/share/etc/x2gothinclient-minidesktop_start etc/x2go/
 management/share/etc/x2gothinclient-minidesktop_background.svg usr/share/backgrounds/x2go/
 management/share/etc/x2gothinclient_init.d/95*    etc/x2go/x2gothinclient_init.d/
-minidesktop/etc/lightdm.conf etc/lightdm/
+minidesktop/etc/lightdm.conf.d/61-x2gothinclient-minidesktop.conf etc/lightdm/lightdm.conf.d/
+minidesktop/lightdm.conf.d/60-x2gothinclient-minidesktop.conf usr/share/lightdm/lightdm.conf.d/
 minidesktop/etc/restart.lightdm etc/lightdm/
 minidesktop/desktop/x2gothinclient-*.desktop usr/share/applications/
 minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/
diff --git a/minidesktop/etc/lightdm.conf.d/61-x2gothinclient-minidesktop.conf b/minidesktop/etc/lightdm.conf.d/61-x2gothinclient-minidesktop.conf
new file mode 100644
index 0000000..6e5f933
--- /dev/null
+++ b/minidesktop/etc/lightdm.conf.d/61-x2gothinclient-minidesktop.conf
@@ -0,0 +1,22 @@
+# The below (commented out) settings are the currently shipped default LightDM
+# settings provided by x2gothinclient-minidesktop. The system-wide defaults are
+# set in <DATADIR>/lightdm/lightdm.conf.d/x2gothinclient-minidesktop.conf.
+#
+# (On most systems, <DATADIR> is /usr/share).
+#
+# If you need to override the system-wide defaults, please adapt them here.
+#
+# Also note, that other packages and/or configuration files adapting LightDM
+# might interfere with X2Go TCE's minidesktop LightDM tweaks. Those should
+# be removed.
+
+[SeatDefaults]
+#xserver-allow-tcp=false
+#greeter-session=lightdm-greeter
+#greeter-hide-users=true
+#user-session=mate
+#session-wrapper=/etc/x2go/x2gothinclient_init
+#autologin-user=x2gothinclient
+#autologin-user-timeout=0
+#pam-service=lightdm-autologin
+#session-cleanup-script=/etc/lightdm/restart.lightdm
diff --git a/minidesktop/etc/lightdm.conf b/minidesktop/lightdm.conf.d/60-x2gothinclient-minidesktop.conf
similarity index 100%
rename from minidesktop/etc/lightdm.conf
rename to minidesktop/lightdm.conf.d/60-x2gothinclient-minidesktop.conf

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git