lp:~noskcaj/ubuntu/vivid/xfce4-power-manager/merge

Created by Jackson Doak on 2014-10-31 and last modified on 2014-10-31
Get this branch:
bzr branch lp:~noskcaj/ubuntu/vivid/xfce4-power-manager/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

50. By Jackson Doak on 2014-10-31

* Merge from Debian. Remaining Ubuntu changes:
* debian/control
  - Switch to using logind for session tracking. Depend on systemd-services
    and add libsystemd-login-dev build dependency.
  - Enable building of lxpanel plugin
  - Update depends for xfce4-power-manager-plugins to xfce4-panel | lxpanel
* debian/rules
  - Do not include xfce4-panel in shlibs
* debian/patches:
  - 0001-Use-translated-device-type-for-unknown-devices-bug-1 added,
  cherry-picked from upstream to fix extra long battery names when the
  battery is not recognized by the system. closes: #763713
* debian/control:
  - update standards version to 3.9.6.
* New upstream release.
* debian/patches:
  - 0001-Fix-handle-lid-switch-with-loginD-Bug-11160 dropped, included
    upstream.
* Upload to unstable
* debian/patches:
  - 0001-Fix-handle-lid-switch-with-loginD-Bug-11160 added, fix incomplete
    patch reverting the logind xfconf hidden variables.
* New upstream release
* Add patch to support upower 0.99. Closes: #752428
* Bump upower depend to >= 0.99

49. By Martin Pitt on 2014-10-30

Build against upower 0.99 (LP: #1330037)

48. By Sean Davis on 2014-09-25

* New upstream bugfix release.
* debian/patches/01_fix-logind-handle-lid-switch.patch:
  - Dropped, included upstream.

47. By Sean Davis on 2014-09-17

* debian/patches/01_fix-logind-handle-lid-switch.patch:
  - Fixes suspend on lid-close (LP: #1349056)

46. By Sean Davis on 2014-09-15

* Merge from Debian experimental. Remaining Ubuntu changes:
* debian/control
  - Switch to using logind for session tracking. Depend on systemd-services
    and add libsystemd-login-dev build dependency.
  - Use upower << 0.99
  - Enable building of lxpanel plugin
  - Update depends for xfce4-power-manager-plugins to xfce4-panel | lxpanel
* debian/rules
  - Do not include xfce4-panel in shlibs

45. By Sean Davis on 2014-08-31

* debian/control
  - Enable building of lxpanel plugin
  - Update depends for xfce4-power-manager-plugins to xfce4-panel | lxpanel
* debian/rules
  - Do not include xfce4-panel in shlibs

44. By Sean Davis on 2014-08-20

New upstream release.

43. By Sean Davis on 2014-08-14

* Merge from debian. Remaining changes:
  - Switch to using logind for session tracking. Depend on systemd-services
    and add libsystemd-login-dev build dependency.
* Use upower << 0.99

42. By Jackson Doak on 2014-06-25

* Merge from debian. (LP: #1334185) Remaining changes:
  - Switch to using logind for session tracking. Depend on systemd-services
    and add libsystemd-login-dev build dependency.
* Use upower << 0.99
* Drop all patches, fixed upstream

41. By Jackson Doak on 2014-06-13

* Merge from debian. 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.
  - 05_dont-allow-systemd-to-handle-suspend-hibernate-events.patch
  - 06_add-shutdown-reboot-functionality-for-systemd.patch
  - 07_fix-screen-dimming.patch
  - 09_sync_session_xfpm_lock_setting.patch
  - 10_inhibit_logind.patch

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/vivid/xfce4-power-manager
This branch contains Public information 
Everyone can see this information.

Subscribers