Merge lp:~ubuntu-branches/ubuntu/natty/casper/natty-201109211754 into lp:ubuntu/natty/casper

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/natty/casper reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/casper/natty-201109211754. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

910. By Luke Yelavich on 2011-04-11

* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Use gsettings to adjust yelp caret navigation, as properly fixed in
    yelp 3.0.1
* ubiquity-hooks/30accessibility: Fix the gset function to set settings for
  the target username, and not the username of the live user

909. By Luke Yelavich on 2011-04-07

* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Enable yelp carrot navigation by default in the moderate visual
    impairment, blindness, and Braille profiles, thanks to Attila Hammer
    for the patch (LP: #752503)

908. By Martin Pitt on 2011-04-04

[ Evan Dandrea ]
* Suppress Log Out item in the live session (LP: #750140).

[ Martin Pitt ]
* scripts/casper-helpers, find_cow_device(): Do not ever probe floppy
  devices. There are lots of computers which still have a floppy controller
  (and thus a /dev/fd0), but no actual floppy. Trying to send anything to
  /dev/fd0 will result in very long timeouts. Here this causes booting the
  live CD to take more than 30 minutes. (See also LP #539515 for the
  corresponding bug in udev/udisks). (LP: #739774)

907. By Luke Yelavich on 2011-04-04

* scripts/casper-bottom/30accessibility:
  - Don't blindly assume that there are no orca config files/directories in
    the created user's home directory. A derivative may have placed something
    in /etc/skel as part of the live filesystem, and we shouldn't be
    clobbering it, thanks to Attila Hammer for the pointer (LP: #744227)

906. By Luke Yelavich on 2011-04-04

* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Also use classic GNOME for the "motor difficulties, pointing devices"
    profile, due to issues with on-screen keyboards and unity search

905. By Luke Yelavich on 2011-04-01

[ Colin Watson ]
* Force apt-cdrom's mount point to /cdrom (LP: #723357). I've left the
  /media/cdrom symlink introduced in 1.259 in place anyway, as it's
  harmless on the live CD and may save some effort elsewhere.

[ Luke Yelavich ]
* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Set the default session to classic GNOME for moderate visual
    impairement, blindness, and braille accessibility profiles (LP: #734659)
  - Fix a few dangling references to user-settings.py (LP: #744214)
  - Don't set /desktop/gnome/accessibility/keyboard/enable for vision
    related profiles (LP: #711131)

904. By Martin Pitt on 2011-03-03

scripts/casper-bottom/05mountpoints: Create a /media/cdrom -> /cdrom
symlink, to work around apt's changed default mount point for Alpha-3.
(LP: #727783)

903. By Luke Yelavich on 2011-02-23

* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Remove code that removes applets from the panel. Indicators are the
    way forward, and we have unity, which works differently.
  - Write orca configuration in json format
  - Set some settings in gsettings parallel to gconf, next cycle there
    will be a full migration to gsettings.
  - Do not change the default window manager setting, this will be done
    according to what is detected with unity/compiz et al.

902. By Evan on 2011-02-11

Handle $cow_backing already being mounted elsewhere (LP: #683260).