This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 3ed748a debian/x2gothinclient-minidesktop.postrm: We use dpkg-divert --rename --add in preinst, so let's use --rename also with dpkg-divert --remove. (See Debian bug #947683). new 802a880 minidesktop: Provide LightDM config adaptations in Debian policy conformant location(s). new 4690eab debian/x2gothinclient-minidesktop.{postinst,maintscript}: Remove previously shipped LightDM config file and reinstate its original (LightDM'ish) state. This involves a pkg revision increment (-0x2go1 -> -0x2go2). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 +++++++- debian/x2gothinclient-minidesktop.install | 3 ++- debian/x2gothinclient-minidesktop.maintscript | 1 + debian/x2gothinclient-minidesktop.postinst | 12 ++++++++++++ .../61-x2gothinclient-minidesktop.conf | 22 ++++++++++++++++++++++ .../60-x2gothinclient-minidesktop.conf} | 0 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 debian/x2gothinclient-minidesktop.maintscript create mode 100644 minidesktop/etc/lightdm.conf.d/61-x2gothinclient-minidesktop.conf rename minidesktop/{etc/lightdm.conf => lightdm.conf.d/60-x2gothinclient-minidesktop.conf} (100%) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 4690eab4034e61dbc9377de451abe91a5e549ac6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 10:14:28 2020 +0100 debian/x2gothinclient-minidesktop.{postinst,maintscript}: Remove previously shipped LightDM config file and reinstate its original (LightDM'ish) state. This involves a pkg revision increment (-0x2go1 -> -0x2go2). --- debian/changelog | 6 +++++- debian/x2gothinclient-minidesktop.maintscript | 1 + debian/x2gothinclient-minidesktop.postinst | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cf1ed74..f17c6c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gothinclient (1.5.0.2-0x2go1) UNRELEASED; urgency=medium +x2gothinclient (1.5.0.2-0x2go2) UNRELEASED; urgency=medium [ Oleksandr Shneyder ] * Update classic TCE to debian buster. @@ -21,6 +21,10 @@ x2gothinclient (1.5.0.2-0x2go1) UNRELEASED; urgency=medium * debian/x2gothinclient-minidesktop.postrm: + We use dpkg-divert --rename --add in preinst, so let's use --rename also with dpkg-divert --remove. (See Debian bug #947683). + * debian/x2gothinclient-minidesktop.{postinst,maintscript}: + + Remove previously shipped LightDM config file and reinstate its + original (LightDM'ish) state. This involves a pkg revision + increment (-0x2go1 -> -0x2go2). -- X2Go Release Manager <git-admin@x2go.org> Fri, 29 Nov 2019 08:26:12 +0100 diff --git a/debian/x2gothinclient-minidesktop.maintscript b/debian/x2gothinclient-minidesktop.maintscript new file mode 100644 index 0000000..4242462 --- /dev/null +++ b/debian/x2gothinclient-minidesktop.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/lightdm/lightdm.conf 1.5.0.2-0x2go2~ diff --git a/debian/x2gothinclient-minidesktop.postinst b/debian/x2gothinclient-minidesktop.postinst index b446610..67ed02c 100755 --- a/debian/x2gothinclient-minidesktop.postinst +++ b/debian/x2gothinclient-minidesktop.postinst @@ -41,4 +41,16 @@ esac #DEBHELPER# +# Drop the ligthdm.conf dpkg diversion (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948181) +# +# This needs to run after dpkg-maintscript-helper calls handled in the above DEBHELPER block. +if dpkg --compare-versions "$2" lt "1.5.0.2-0x2go2~" ; then + + # Clean up an early age mess (dpkg-divert on conffile /etc/lightdm/lightdm.conf) + + if dpkg-divert --list | grep lightdm.conf.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then + dpkg-divert --package x2gothinclient-minidesktop --rename --remove /etc/lightdm/lightdm.conf + fi +fi + exit 0 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
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@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
-
git-admin＠x2go.org