Merge lp://staging/~psusi/ubuntu/natty/upower/sleep into lp://staging/ubuntu/natty/upower

You seem to have accidentally changed the copyright header in src/up-daemon.c; apart from that, looks good.

Oops, good catch. Looks like my editor got a little excited about tabifying whitespace. I also had forgotten to add -pab --no-timestamps when freshing the quilt patch. Corrected.

I disagree with changing an established and cross-distro D-Bus interface here.

And even though you fix g-p-m, I don't see patches for kdebase-workspace-bin or xfce4-power-manager. And even if you patched all of the utilities in the Ubuntu archive that used UPower, there could be any number of third-party programs that are expecting UPower to conform to its cross-distro definition (http://upower.freedesktop.org/docs/UPower.html).

The better approach here is to add a new signal that includes the argument, but leave the old signal alone, and that seems to be the conclusion that upstream is coming to as well.

I agree with Evan here, and it's not clear whether hughsie agrees with this approach either (see http://lists.freedesktop.org/archives/devkit-devel/2011-March/001056.html). At this stage in the cycle, we shouldn't be breaking public dbus API's like this.

In addition to this, bypassing the upower client library reduces traceability (which is a big advantage of using client libraries to wrap dbus interfaces), and that traceability is required for problems exactly like this (ie, it's easy to find consumers of libupower and we have processes for library versioning if you want to break the API, but it's much more difficult to trace consumers of the raw dbus interface or properly version it if you want to break it).