ubiquity

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

  1. lp1437180_feh
  2. Merge into trunk
Proposed by Sean Davis on 2015-06-18
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2015-07-02
Approved revision: 6307
Merged at revision: 6307
Proposed branch: lp:~xubuntu-dev/ubiquity/lp1437180_feh
Merge into: lp:ubiquity
Diff against target: 40 lines (+7/-8)
2 files modified
bin/ubiquity-dm (+0/-8)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~xubuntu-dev/ubiquity/lp1437180_feh
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-06-18 Approve on 2015-07-02
Review via email: mp+262285@code.launchpad.net

Description of the Change

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).

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity-dm'
2--- bin/ubiquity-dm 2015-03-18 12:08:09 +0000
3+++ bin/ubiquity-dm 2015-06-18 01:19:42 +0000
4@@ -515,10 +515,6 @@
5
6 if osextras.find_on_path('xfsettingsd'):
7 extras.append(subprocess.Popen(
8- ['xsetroot', '-solid', 'black'],
9- stdin=null, stdout=logfile, stderr=logfile,
10- preexec_fn=self.drop_privileges))
11- extras.append(subprocess.Popen(
12 ['xprop', '-root', '-format', '_NET_NUMBER_OF_DESKTOPS',
13 '32c', '-set', '_NET_NUMBER_OF_DESKTOPS', '1'],
14 stdin=null, stdout=logfile, stderr=logfile,
15@@ -527,10 +523,6 @@
16 ['xfsettingsd', '--sm-client-disable'],
17 stdin=null, stdout=logfile, stderr=logfile,
18 preexec_fn=self.drop_privileges))
19- extras.append(subprocess.Popen(
20- ['xfdesktop', '--sm-client-disable'],
21- stdin=null, stdout=logfile, stderr=logfile,
22- preexec_fn=self.drop_privileges))
23
24 if osextras.find_on_path('lxsession'):
25 extras.append(subprocess.Popen(
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2015-06-04 14:36:54 +0000
29+++ debian/changelog 2015-06-18 01:19:42 +0000
30@@ -1,3 +1,10 @@
31+ubiquity (2.21.28) UNRELEASED; urgency=medium
32+
33+ * bin/ubiquity-dm: Draw the ubiquity desktop with feh under
34+ Xfce environments (LP: #1437180)
35+
36+ -- Sean Davis <smd.seandavis@gmail.com> Wed, 17 Jun 2015 00:11:15 -0400
37+
38 ubiquity (2.21.27) wily; urgency=medium
39
40 * Automatic update of included source packages: choose-mirror

Subscribers

People subscribed via source and target branches

to status/vote changes: