Merge lp:~ubuntu-branches/ubuntu/maverick/casper/maverick-201109211749 into lp:ubuntu/maverick/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/maverick/casper reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/casper/maverick-201109211749. 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

858. By Luke Yelavich on 2010-10-05

ubiquity-hooks/30accessibility: Create .local/share subdirectory structure
before copying files. Also copy orca files to ~/.local/share, instead
~/. Thanks to Attila Hammer for the patch. (LP: #650846)

857. By Jonathan Thomas on 2010-10-04

Check for the existance of a kubuntu-default-settings directory before
running scripts/casper-bottom/48kubuntu_disable_restart_notifications

856. By Michael Casadevall on 2010-09-27

  * Added scripts/casper-bottom/07remove_oem_config
  - Added new script to remove oem-config if installed on the image on ARM,
    as it should never be installed on a non-preinstalled image. This is
    necessary because we can't exclude oem-config on the seed on a
    per-subarchitecture basis
* scripts/casper/47une_ubiquity
  - Cause gconf changes to be made to both the 2D & 3D UNE launchers so
    ubiquity properly shows up in favorites regardless of which launcher is
    used (LP: #643791)

855. By Jonathan Thomas on 2010-09-28

* Add scripts/casper-bottom/49disable_kubuntu_restart_notify for a more
  surgical solution at disabling restart notifications on the Live CD
* Don't remove the notificationhelper.desktop file in 34disable_kde_services

854. By Luke Yelavich on 2010-09-16

* scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
  - Use orca's new settings location in ~/.local/share, as orca is now
    more XDG compliant

853. By Colin Watson on 2010-09-07

* Backport from live-initramfs 1.154.6-1:
  - Adding patch from Thierry Walrant <email address hidden> to allow
    setting a path for the persistence files through persistent-path boot
    parameter (Closes: #512661).
* Follow symlinks when checking for dynamically linked files at reboot.