Merge lp:~fossfreedom/ubiquity/fix_add_ubuntu_budgie_support into lp:ubiquity

[fossfreedom]

This adds support for Ubuntu Budgie (LP: #1654368)

[lp:~fossfreedom/ubiquity/fix_add_ubuntu_budgie_support]

6503. By fossfreedom on 2017-01-06

corrected bug report - 1654368

[Colin Watson (cjwatson)]

review: Approve

[lp:~fossfreedom/ubiquity/fix_add_ubuntu_budgie_support]

6504. By fossfreedom on 2017-01-07

slightly restructure to reduce code duplication

[fossfreedom (fossfreedom)]

Many thanks Colin,

  have made those changes requested. Have done a debuild, as well as tested the resulting .debs in a live-session.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2016-12-02 14:58:25 +0000
+++ bin/ubiquity-dm	2017-01-07 10:10:26 +0000
@@ -492,7 +492,8 @@
                             ('org.mate.background', 'picture-filename',
                              "''"))
 
-                if osextras.find_on_path('gnome-shell'):
+                if (osextras.find_on_path('gnome-shell') or
+                        osextras.find_on_path('budgie-wm')):
                     gsettings_keys.append(
                         ('org.gnome.settings-daemon.plugins.background',
                          'active', 'false'))
@@ -551,6 +552,8 @@
 
             if osextras.find_on_path('gnome-shell'):
                 wm_cmd = ['gnome-shell', '--sm-disable', '--mode=ubiquity']
+            elif osextras.find_on_path('budgie-wm'):
+                wm_cmd = ['budgie-wm', '--sm-disable']
             elif osextras.find_on_path('marco'):
                 wm_cmd = ['marco', '--sm-disable']
             elif osextras.find_on_path('metacity'):
@@ -569,8 +572,9 @@
             else:
                 raise MissingProgramError(
                     'No window manager found (tried '
-                    'marco, metacity, xfwm4, matchbox-window-manager, '
-                    'openbox-lubuntu, openbox, compiz)')
+                    'gnome-shell, budgie-wm, marco, metacity, xfwm4, '
+                    'matchbox-window-manager, openbox-lubuntu, '
+                    'openbox, compiz)')
 
             wm = subprocess.Popen(
                 wm_cmd, stdin=null, stdout=logfile, stderr=logfile,
@@ -596,7 +600,8 @@
             if os.path.exists('/usr/lib/ubiquity/panel'):
                 if ("openbox-lubuntu" not in wm_cmd and
                         "openbox" not in wm_cmd and
-                        "gnome-shell" not in wm_cmd):
+                        "gnome-shell" not in wm_cmd and
+                        "budgie-wm" not in wm_cmd):
                     multiarchdir = os.path.split(
                         sysconfig.get_config_var('multiarchsubdir'))[-1]
                     indicators = list(filter(os.path.isfile, [
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-12-05 12:39:44 +0000
+++ debian/changelog	2017-01-07 10:10:26 +0000
@@ -1,3 +1,9 @@
+ubiquity (17.04.2) zesty; urgency=medium
+
+  * Update ubiquity-dm to support Ubuntu Budgie (LP: #1654368)
+
+ -- David Mohammed <[e-mail]>  Fri, 06 Jan 2017 23:23:30 +0000
+
 ubiquity (17.04.1) zesty; urgency=medium
 
   * Update sources to zesty.