This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 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). new 1cca89f debian/x2gothinclient-minidesktop.{preinst,postrm}: Drop diversion of /etc/lightdm/lightdm.conf. This has been a bad idea. (See Debian bug #947683). The 1 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 | 9 ++++++--- debian/x2gothinclient-minidesktop.postrm | 3 --- debian/x2gothinclient-minidesktop.preinst | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) -- 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 1cca89fe78e3063f33a2e2108eca527fd1c38036 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 10:36:15 2020 +0100 debian/x2gothinclient-minidesktop.{preinst,postrm}: Drop diversion of /etc/lightdm/lightdm.conf. This has been a bad idea. (See Debian bug #947683). --- debian/changelog | 9 ++++++--- debian/x2gothinclient-minidesktop.postrm | 3 --- debian/x2gothinclient-minidesktop.preinst | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index f17c6c7..c19d332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,13 +18,16 @@ x2gothinclient (1.5.0.2-0x2go2) UNRELEASED; urgency=medium conformant location(s). * debian/control: + Add Ds (minidesktop): alsa-tools, pulseaudio, pavucontrol. - * 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.{preinst,postrm}: + + Drop diversion of /etc/lightdm/lightdm.conf. This has been a bad idea. + (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). + * 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). -- X2Go Release Manager <git-admin@x2go.org> Fri, 29 Nov 2019 08:26:12 +0100 diff --git a/debian/x2gothinclient-minidesktop.postrm b/debian/x2gothinclient-minidesktop.postrm index 02ccc76..53ccf12 100755 --- a/debian/x2gothinclient-minidesktop.postrm +++ b/debian/x2gothinclient-minidesktop.postrm @@ -24,9 +24,6 @@ case "$1" in if dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then dpkg-divert --package x2gothinclient-minidesktop --rename --remove /usr/bin/x2goclient fi - 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 ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/debian/x2gothinclient-minidesktop.preinst b/debian/x2gothinclient-minidesktop.preinst index 5bfb315..b7c6f26 100755 --- a/debian/x2gothinclient-minidesktop.preinst +++ b/debian/x2gothinclient-minidesktop.preinst @@ -26,9 +26,6 @@ case "$1" in if ! dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/lib/x2go/x2goclient /usr/bin/x2goclient fi - if ! dpkg-divert --list | grep lightdm.conf.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then - dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /etc/lightdm/lightdm.conf.disabled-by-x2gotce /etc/lightdm/lightdm.conf - fi ;; abort-upgrade) ;; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org