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

[Simon Steinbeiß]

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.

[lp:~ochosi/ubiquity/quantal-proposed]

5631. By Simon Steinbeiß on 2012-09-11

Update changelog for fixing LP: #924909.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2012-08-20 05:17:16 +0000
+++ bin/ubiquity-dm	2012-09-11 16:40:27 +0000
@@ -388,7 +388,7 @@
             if gconfd_running and osextras.find_on_path('metacity'):
                 wm_cmd = ['metacity', '--sm-disable']
             elif osextras.find_on_path('xfwm4'):
-                wm_cmd = ['xfwm4']
+                wm_cmd = ['xfwm4', '--compositor=off']
             elif osextras.find_on_path('matchbox-window-manager'):
                 wm_cmd = ['matchbox-window-manager']
             elif osextras.find_on_path('openbox-lubuntu'):
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-09-11 15:19:46 +0000
+++ debian/changelog	2012-09-11 16:40:27 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubiquity (2.11.32) UNRELEASED; urgency=low
 
   [ Jeremy Bicha ]
@@ -23,8 +24,14 @@
 ubiquity (2.11.31) quantal; urgency=low
 
   [ Colin Watson ]
+=======
+ubiquity (2.11.31) UNRELEASED; urgency=low
+
+  [ Colin Watson ]
+>>>>>>> MERGE-SOURCE
   * Buffer reads from debconf-copydb.  Python 3 defaults to unbuffered reads
     from byte streams, which is much slower.
+<<<<<<< TREE
   * Port oem-config-remove-gtk to Python 3, now that
     python3-aptdaemon.gtk3widgets exists; the final piece!
   * Remove Python 2 support.  We aren't going back now.
@@ -61,6 +68,13 @@
     extra_slides_dir. (LP: #1046511)
 
  -- Dmitrijs Ledkovs <[e-mail]>  Sat, 08 Sep 2012 00:47:54 +0100
+=======
+
+  [ Simon Steinbeiß ]
+  * Disable xfwm4's compositor in ubiquity-dm to prevent screen-corruption (LP: #924909).
+
+ -- Simon Steinbeiß <[e-mail]>  Tue, 11 Sep 2012 18:35:28 +0200
+>>>>>>> MERGE-SOURCE
 
 ubiquity (2.11.30) quantal; urgency=low