Merge lp:~xubuntu-dev/ubiquity/lp1437180_feh into lp:ubiquity

[Sean Davis]

This change allows feh to draw the desktop with Xfce components. This enables a simpler, lower resource desktop option at install time and eliminates the issues with a full-fledged desktop application running (launching apps, displaying icons, etc).

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me. Feh is already handled, and will be used to set wallpaper if it's found in the path.

I'll do a quick run of testing and merge/upload this with another ubiquity MP.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2015-03-18 12:08:09 +0000
+++ bin/ubiquity-dm	2015-06-18 01:19:42 +0000
@@ -515,10 +515,6 @@
 
             if osextras.find_on_path('xfsettingsd'):
                 extras.append(subprocess.Popen(
-                    ['xsetroot', '-solid', 'black'],
-                    stdin=null, stdout=logfile, stderr=logfile,
-                    preexec_fn=self.drop_privileges))
-                extras.append(subprocess.Popen(
                     ['xprop', '-root', '-format', '_NET_NUMBER_OF_DESKTOPS',
                      '32c', '-set', '_NET_NUMBER_OF_DESKTOPS', '1'],
                     stdin=null, stdout=logfile, stderr=logfile,
@@ -527,10 +523,6 @@
                     ['xfsettingsd', '--sm-client-disable'],
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
-                extras.append(subprocess.Popen(
-                    ['xfdesktop', '--sm-client-disable'],
-                    stdin=null, stdout=logfile, stderr=logfile,
-                    preexec_fn=self.drop_privileges))
 
             if osextras.find_on_path('lxsession'):
                 extras.append(subprocess.Popen(

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-04 14:36:54 +0000
+++ debian/changelog	2015-06-18 01:19:42 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.21.28) UNRELEASED; urgency=medium
+
+  * bin/ubiquity-dm: Draw the ubiquity desktop with feh under
+    Xfce environments (LP: #1437180)
+
+ -- Sean Davis <[e-mail]>  Wed, 17 Jun 2015 00:11:15 -0400
+
 ubiquity (2.21.27) wily; urgency=medium
 
   * Automatic update of included source packages: choose-mirror