Merge lp:~ubuntu-branches/ubuntu/trusty/plymouth/trusty-201404040052 into lp:ubuntu/trusty/plymouth

[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/trusty/plymouth reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/plymouth/trusty-201404040052. 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

1481. By Dimitri John Ledkov on 2014-04-03

releasing package plymouth version 0.8.8-0ubuntu16

1480. By Dimitri John Ledkov on 2014-03-14

[ Dimitri John Ledkov ] LP: #1292458

1479. By Dimitri John Ledkov on 2014-03-13

Fix up scale-factor-2 patch

1478. By Dimitri John Ledkov on 2014-03-13

Mark plymouth-upstart-bridge to respawn.

1477. By Dimitri John Ledkov on 2014-03-13

Make ubuntu-logo theme support scale factor, provide one plymouth
theme with scale 1 and another with scale 2, until scale factor can be
dynamically detected.

1476. By Dimitri John Ledkov on 2014-03-13

  empty "Starting... done" messages. LP: #1185560.

1475. By Dimitri John Ledkov on 2014-03-13

debian/plymouth.plymouth-upstart-bridge.upstart: update stop on
conditions to stop when plymouth-shutdown finishes.

1474. By Dimitri John Ledkov on 2014-03-13

* debian/patches/no-print-empty-description.patch: do not store
description when dbus returns empty string, and thus stop printing
empty "Starting... done" messages.

1473. By Dimitri John Ledkov on 2014-03-13

system dbus, use private upstart socket in the plymouth-upstart-bridge.
* debian/patches/dont-bail-on-dummy-terms.patch: don't bail
plymouth-upstart-bridge if TERM is not set and/or running on a dummy
terminal, as we can run on those.

1472. By Dimitri John Ledkov on 2014-03-12

* debian/patches/use-upstart-private-socket.patch: instead of using
  system dbus, use private upstart socket.
* debian/plymouth.plymouth-upstart-bridge.upstart: start
  plymouth-upstart-bridge on startup, and thus gather a more complete
  boot.log.