[X2Go-Commits] [x2gothinclient] 02/02: 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).

[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 4690eab4034e61dbc9377de451abe91a5e549ac6
Author: Mike Gabriel <mike.gabriel at 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 at 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