ubiquity

Merge lp:~ochosi/ubiquity/quantal-proposed into lp:ubiquity

  1. quantal-proposed
  2. Merge into trunk
Proposed by Simon Steinbeiß on 2012-09-06
Status: Merged
Merged at revision: 5655
Proposed branch: lp:~ochosi/ubiquity/quantal-proposed
Merge into: lp:ubiquity
Diff against target: 49 lines (+15/-1) (has conflicts)
2 files modified
bin/ubiquity-dm (+1/-1)
debian/changelog (+14/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ochosi/ubiquity/quantal-proposed
Reviewer Review Type Date Requested Status
Ubuntu Installer Team 2012-09-06 Pending
Review via email: mp+123041@code.launchpad.net

Description of the Change

This simply change just switches off the Xfwm4 compositor in ubiquity-dm, as it was causing rendering issues with the ubiquity-only session.

The change has been tested and screenshots of the working patch have been attached to LP: #924909.

To post a comment you must log in.
lp:~ochosi/ubiquity/quantal-proposed updated on 2012-09-11
5631. By Simon Steinbeiß on 2012-09-11

Update changelog for fixing LP: #924909.

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 2012-08-20 05:17:16 +0000
3+++ bin/ubiquity-dm 2012-09-11 16:40:27 +0000
4@@ -388,7 +388,7 @@
5 if gconfd_running and osextras.find_on_path('metacity'):
6 wm_cmd = ['metacity', '--sm-disable']
7 elif osextras.find_on_path('xfwm4'):
8- wm_cmd = ['xfwm4']
9+ wm_cmd = ['xfwm4', '--compositor=off']
10 elif osextras.find_on_path('matchbox-window-manager'):
11 wm_cmd = ['matchbox-window-manager']
12 elif osextras.find_on_path('openbox-lubuntu'):
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2012-09-11 15:19:46 +0000
16+++ debian/changelog 2012-09-11 16:40:27 +0000
17@@ -1,3 +1,4 @@
18+<<<<<<< TREE
19 ubiquity (2.11.32) UNRELEASED; urgency=low
20
21 [ Jeremy Bicha ]
22@@ -23,8 +24,14 @@
23 ubiquity (2.11.31) quantal; urgency=low
24
25 [ Colin Watson ]
26+=======
27+ubiquity (2.11.31) UNRELEASED; urgency=low
28+
29+ [ Colin Watson ]
30+>>>>>>> MERGE-SOURCE
31 * Buffer reads from debconf-copydb. Python 3 defaults to unbuffered reads
32 from byte streams, which is much slower.
33+<<<<<<< TREE
34 * Port oem-config-remove-gtk to Python 3, now that
35 python3-aptdaemon.gtk3widgets exists; the final piece!
36 * Remove Python 2 support. We aren't going back now.
37@@ -61,6 +68,13 @@
38 extra_slides_dir. (LP: #1046511)
39
40 -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Sat, 08 Sep 2012 00:47:54 +0100
41+=======
42+
43+ [ Simon Steinbeiß ]
44+ * Disable xfwm4's compositor in ubiquity-dm to prevent screen-corruption (LP: #924909).
45+
46+ -- Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at> Tue, 11 Sep 2012 18:35:28 +0200
47+>>>>>>> MERGE-SOURCE
48
49 ubiquity (2.11.30) quantal; urgency=low
50

Subscribers

People subscribed via source and target branches

to status/vote changes: