diff -u mesa-18.0.5/debian/changelog mesa-18.0.5/debian/changelog
--- mesa-18.0.5/debian/changelog
+++ mesa-18.0.5/debian/changelog
@@ -1,3 +1,13 @@
+mesa (18.0.5-0ubuntu0~18.04.2) UNRELEASED; urgency=medium
+
+  * debian/libegl1-mesa.postinst: If there's a removed-but-not-purged
+    /etc/X11/Xsession.d/50_check_unity_support file from a buggy version of
+    nux (see bug #XXX), move it aside. It'll stop interfering with the session
+    then. If the user later reinstalls nux-tools, nux-tools will pick this
+    file back up so the conffile will not be lost.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Thu, 14 Jun 2018 09:34:09 +0100
+
 mesa (18.0.5-0ubuntu0~18.04.1) bionic; urgency=medium
 
   * New upstream release. (LP: #1772607)
only in patch2:
unchanged:
--- mesa-18.0.5.orig/debian/libegl1.postinst
+++ mesa-18.0.5/debian/libegl1.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+# only try to do any of this one time; we know that current versions of nux are
+# fixed
+
+if [ "$1" = "configure" ] &&
+   dpkg --compare-versions "$2" lt-nl 18.0.5-0ubuntu0~18.04.2 &&
+   [ -e /etc/X11/Xsession.d/50_check_unity_support ]; then
+        NUX_TOOLS_STATE=$(dpkg-query --show --showformat='${db:Status-Status}' nux-tools)
+        NUX_TOOLS_VERSION=$(dpkg-query --show --showformat='${Version}' nux-tools)
+
+        # only if we have an older version than the one which also got fixed
+        # the version here is the version that got the fixed file
+        if [ "${NUX_TOOLS_STATE}" = "config-files" ] &&
+           dpkg --compare-versions "${NUX_TOOLS_VERSION}" lt-nl 4.0.8+18.04.20180613.5-0ubuntu1; then
+                echo "Broken /etc/X11/Xsession.d/50_check_unity_support and removed nux-tools found, moving aside..."
+                mv /etc/X11/Xsession.d/50_check_unity_support /etc/X11/Xsession.d/50_check_unity_support.mesa-save
+        fi
+fi
+
+#DEBHELPER#