-
Committer:
Package Import Robot
-
Author(s):
Jackson Doak, Jackson Doak, Logan Rosen
-
Date:
2013-12-11 18:22:21 UTC
-
mfrom:
(6.2.14 sid)
-
Revision ID:
package-import@ubuntu.com-20131211182221-qh7yayynza61xnnn
Tags: 1.2.0-3ubuntu1
[ Jackson Doak ]
* Merged from debian unstable. Remaining changes:
- 06_fix-suspend-auth-check.patch: added, correctly check for suspend
permissions before disabling the corresponding drop-down menu item.
lp #929537
- 08_show_preferences_lxde.patch: Hide settings menu only on desktop
environment which have another power manager.
- Switch to using logind for session tracking. Depend on systemd-services
instead of consolekit recommends, and add libsystemd-login-dev build
dependency.
* Drop xubuntu_fix-status-icon-other-devices.patch, fixed in debian
[ Logan Rosen ]
* Get rid of 09_fix_insert_battery.patch, an Ubuntu patch that was applied
in Debian.