Merge ~thesquash/ubuntu/+source/ubiquity:ubuntu/devel into ubuntu/+source/ubiquity:ubuntu/devel

[Gordon N. Squash]

The code to export the $DISPLAY variable to D-Bus services, needed for
accessibility bus support, was only activated for stock Ubuntu and
Kubuntu but not for other derivatives like Ubuntu MATE. This commit
exports $DISPLAY on all spins of Ubuntu.

See https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1231091/comments/17
for far, far more details on this.

The code to export the $DISPLAY variable to D-Bus services, needed for
accessibility bus support, was only activated for stock Ubuntu and
Kubuntu but not for other derivatives like Ubuntu MATE. When merged,
this commit exports $DISPLAY on all spins of Ubuntu.

Fixes: https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1231091

[Brian Murray (brian-murray)]

Thanks for working on this and the detailed analysis Gordon! The correct upstream branch for ubiquity is located here:

https://code.launchpad.net/ubiquity/

But there is no need to create a new merge proposal as I've already manually merged your changes and uploaded a new version of ubiquity to the archive. It should make the RC images! Thanks again.

[Ark74 (ark74)]

Hi! quick question, is this likely to be backported back to Focal?

Or will go from Impish forward?
Thanks

diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
index 08e96d1..227301c 100755
--- a/bin/ubiquity-dm
+++ b/bin/ubiquity-dm
@@ -404,11 +404,7 @@ EndSection
                 stdin=null, stdout=logfile, stderr=logfile,
                 preexec_fn=self.drop_privileges))
 
-        if (
-            osextras.find_on_path("kwin") or
-            osextras.find_on_path("kwin_x11") or
-            osextras.find_on_path("gnome-shell")
-        ) and osextras.find_on_path("dbus-update-activation-environment"):
+        if osextras.find_on_path("dbus-update-activation-environment"):
             subprocess.Popen(
                 [
                     "dbus-update-activation-environment",